[KEW-1463] Clean up recommendations/remove REX

worldwide-asset-exchange · Aug 12, 2019 · dfc2721 · dfc2721
2 parents 4308b25 + f210c4d
commit dfc2721
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 1,658 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,24 @@
 # Changelog
 
+## Pending (wax-1.7.0-X.Y.Z)
 
-## Pending (wax-1.5.2-X.Y.Z)
+BREAKING CHANGES:
+
+FEATURES:
+
+IMPROVEMENTS:
+
+BUG FIXES:
+
+## Pending (wax-1.7.0-1.1.0)
 
 BREAKING CHANGES:
 
 FEATURES:
 
 IMPROVEMENTS:
+- [KEW-1468] Removed REX referencies.
+- [KEW-1463] Clean up recommendations
 
 BUG FIXES:
 

diff --git a/contracts/eosio.system/CMakeLists.txt b/contracts/eosio.system/CMakeLists.txt
@@ -4,7 +4,6 @@ add_contract(eosio.system eosio.system
    ${CMAKE_CURRENT_SOURCE_DIR}/src/exchange_state.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/src/native.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/src/producer_pay.cpp
-   ${CMAKE_CURRENT_SOURCE_DIR}/src/rex.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/src/voting.cpp
 )
 
@@ -17,16 +16,6 @@ set_target_properties(eosio.system
    PROPERTIES
    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
 
-add_contract(rex.results rex.results ${CMAKE_CURRENT_SOURCE_DIR}/src/rex.results.cpp)
-
-target_include_directories(rex.results
-   PUBLIC
-   ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-set_target_properties(rex.results
-   PROPERTIES
-   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.rex")
-
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/ricardian/eosio.system.contracts.md.in ${CMAKE_CURRENT_BINARY_DIR}/ricardian/eosio.system.contracts.md @ONLY )
 
 target_compile_options( eosio.system PUBLIC -R${CMAKE_CURRENT_SOURCE_DIR}/ricardian -R${CMAKE_CURRENT_BINARY_DIR}/ricardian )