From 7d6b2156e44cccb2e1837072a7a9eebd3b15a5bd Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Thu, 19 Sep 2019 11:52:23 -0300 Subject: [PATCH] rename and move stuff --- .../app/include/graphene/app/database_api.hpp | 3 +-- libraries/chain/CMakeLists.txt | 2 +- libraries/chain/db_init.cpp | 8 ++------ .../graphene/chain/protocol/operations.hpp | 3 +-- .../son_operations.hpp => protocol/son.hpp} | 0 ...erations_evaluator.hpp => son_evaluator.hpp} | 2 +- .../{btc-sidechain/son.hpp => son_object.hpp} | 0 ...erations_evaluator.cpp => son_evaluator.cpp} | 4 ++-- tests/CMakeLists.txt | 4 ---- tests/btc_sidechain_tests/main.cpp | 17 ----------------- .../son_operations_tests.cpp | 4 ++-- 11 files changed, 10 insertions(+), 37 deletions(-) rename libraries/chain/include/graphene/chain/{btc-sidechain/son_operations.hpp => protocol/son.hpp} (100%) rename libraries/chain/include/graphene/chain/{btc-sidechain/son_operations_evaluator.hpp => son_evaluator.hpp} (92%) rename libraries/chain/include/graphene/chain/{btc-sidechain/son.hpp => son_object.hpp} (100%) rename libraries/chain/{btc-sidechain/son_operations_evaluator.cpp => son_evaluator.cpp} (93%) delete mode 100644 tests/btc_sidechain_tests/main.cpp rename tests/{btc_sidechain_tests => tests}/son_operations_tests.cpp (94%) diff --git a/libraries/app/include/graphene/app/database_api.hpp b/libraries/app/include/graphene/app/database_api.hpp index 0500023e..c6430243 100644 --- a/libraries/app/include/graphene/app/database_api.hpp +++ b/libraries/app/include/graphene/app/database_api.hpp @@ -43,8 +43,7 @@ #include #include #include - -#include +#include #include #include diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt index c7c8e7f8..5b3eea31 100644 --- a/libraries/chain/CMakeLists.txt +++ b/libraries/chain/CMakeLists.txt @@ -111,7 +111,7 @@ add_library( graphene_chain affiliate_payout.cpp - btc-sidechain/son_operations_evaluator.cpp + son_evaluator.cpp ${HEADERS} ${PROTOCOL_HEADERS} diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index d3f79796..647ffb5f 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -49,13 +49,12 @@ #include #include #include - - #include #include #include #include #include +#include #include #include @@ -76,13 +75,10 @@ #include #include #include - -#include +#include #include -#include - #include #include #include diff --git a/libraries/chain/include/graphene/chain/protocol/operations.hpp b/libraries/chain/include/graphene/chain/protocol/operations.hpp index 73258a9d..6760791f 100644 --- a/libraries/chain/include/graphene/chain/protocol/operations.hpp +++ b/libraries/chain/include/graphene/chain/protocol/operations.hpp @@ -44,8 +44,7 @@ #include #include #include - -#include +#include namespace graphene { namespace chain { diff --git a/libraries/chain/include/graphene/chain/btc-sidechain/son_operations.hpp b/libraries/chain/include/graphene/chain/protocol/son.hpp similarity index 100% rename from libraries/chain/include/graphene/chain/btc-sidechain/son_operations.hpp rename to libraries/chain/include/graphene/chain/protocol/son.hpp diff --git a/libraries/chain/include/graphene/chain/btc-sidechain/son_operations_evaluator.hpp b/libraries/chain/include/graphene/chain/son_evaluator.hpp similarity index 92% rename from libraries/chain/include/graphene/chain/btc-sidechain/son_operations_evaluator.hpp rename to libraries/chain/include/graphene/chain/son_evaluator.hpp index f6a3e63e..57b879b6 100644 --- a/libraries/chain/include/graphene/chain/btc-sidechain/son_operations_evaluator.hpp +++ b/libraries/chain/include/graphene/chain/son_evaluator.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include +#include namespace graphene { namespace chain { diff --git a/libraries/chain/include/graphene/chain/btc-sidechain/son.hpp b/libraries/chain/include/graphene/chain/son_object.hpp similarity index 100% rename from libraries/chain/include/graphene/chain/btc-sidechain/son.hpp rename to libraries/chain/include/graphene/chain/son_object.hpp diff --git a/libraries/chain/btc-sidechain/son_operations_evaluator.cpp b/libraries/chain/son_evaluator.cpp similarity index 93% rename from libraries/chain/btc-sidechain/son_operations_evaluator.cpp rename to libraries/chain/son_evaluator.cpp index 9ce855b3..b469a0de 100644 --- a/libraries/chain/btc-sidechain/son_operations_evaluator.cpp +++ b/libraries/chain/son_evaluator.cpp @@ -1,7 +1,7 @@ -#include +#include #include -#include +#include namespace graphene { namespace chain { diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 88c6e8ea..fef122b5 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -45,8 +45,4 @@ file(GLOB RANDOM_SOURCES "random/*.cpp") add_executable( random_test ${RANDOM_SOURCES} ${COMMON_SOURCES} ) target_link_libraries( random_test graphene_chain graphene_app graphene_egenesis_none fc ${PLATFORM_SPECIFIC_LIBS} ) -file(GLOB UNIT_TESTS "btc_sidechain_tests/*.cpp") -add_executable( btc_sidechain_test ${UNIT_TESTS} ${COMMON_SOURCES} ) -target_link_libraries( btc_sidechain_test graphene_chain graphene_app graphene_account_history graphene_bookie graphene_egenesis_none fc graphene_wallet ${PLATFORM_SPECIFIC_LIBS} ) - add_subdirectory( generate_empty_blocks ) diff --git a/tests/btc_sidechain_tests/main.cpp b/tests/btc_sidechain_tests/main.cpp deleted file mode 100644 index 40b64f9d..00000000 --- a/tests/btc_sidechain_tests/main.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include -#include -#include - -extern uint32_t GRAPHENE_TESTING_GENESIS_TIMESTAMP; - -boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) { - std::srand(time(NULL)); - std::cout << "Random number generator seeded to " << time(NULL) << std::endl; - const char* genesis_timestamp_str = getenv("GRAPHENE_TESTING_GENESIS_TIMESTAMP"); - if( genesis_timestamp_str != nullptr ) - { - GRAPHENE_TESTING_GENESIS_TIMESTAMP = std::stoul( genesis_timestamp_str ); - } - std::cout << "GRAPHENE_TESTING_GENESIS_TIMESTAMP is " << GRAPHENE_TESTING_GENESIS_TIMESTAMP << std::endl; - return nullptr; -} diff --git a/tests/btc_sidechain_tests/son_operations_tests.cpp b/tests/tests/son_operations_tests.cpp similarity index 94% rename from tests/btc_sidechain_tests/son_operations_tests.cpp rename to tests/tests/son_operations_tests.cpp index 08f9ca68..45ff8a4e 100644 --- a/tests/btc_sidechain_tests/son_operations_tests.cpp +++ b/tests/tests/son_operations_tests.cpp @@ -4,8 +4,8 @@ #include "../common/database_fixture.hpp" -#include -#include +#include +#include using namespace graphene::chain; using namespace graphene::chain::test;