Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

rename and move stuff

Browse source
This commit is contained in:
Alfredo Garcia 2019-09-19 11:52:23 -03:00
parent d36168b71e
commit 7d6b2156e4
11 changed files with 10 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/app/include/graphene/app/database_api.hpp
View file

@ -43,8 +43,7 @@
#include <graphene/chain/event_object.hpp>
#include <graphene/chain/betting_market_object.hpp>
#include <graphene/chain/global_betting_statistics_object.hpp>
#include <graphene/chain/btc-sidechain/son.hpp>
#include <graphene/chain/son_object.hpp>
#include <graphene/chain/worker_object.hpp>
#include <graphene/chain/witness_object.hpp>

2
libraries/chain/CMakeLists.txt
View file

@ -111,7 +111,7 @@ add_library( graphene_chain
affiliate_payout.cpp
btc-sidechain/son_operations_evaluator.cpp
son_evaluator.cpp
${HEADERS}
${PROTOCOL_HEADERS}

8
libraries/chain/db_init.cpp
View file

@ -49,13 +49,12 @@
#include <graphene/chain/tournament_object.hpp>
#include <graphene/chain/match_object.hpp>
#include <graphene/chain/game_object.hpp>
#include <graphene/chain/sport_object.hpp>
#include <graphene/chain/event_group_object.hpp>
#include <graphene/chain/event_object.hpp>
#include <graphene/chain/betting_market_object.hpp>
#include <graphene/chain/global_betting_statistics_object.hpp>
#include <graphene/chain/son_object.hpp>
#include <graphene/chain/account_evaluator.hpp>
#include <graphene/chain/asset_evaluator.hpp>
@ -76,13 +75,10 @@
#include <graphene/chain/event_evaluator.hpp>
#include <graphene/chain/betting_market_evaluator.hpp>
#include <graphene/chain/tournament_evaluator.hpp>
#include <graphene/chain/btc-sidechain/son_operations_evaluator.hpp>
#include <graphene/chain/son_evaluator.hpp>
#include <graphene/chain/protocol/fee_schedule.hpp>
#include <graphene/chain/btc-sidechain/son.hpp>
#include <fc/smart_ref_impl.hpp>
#include <fc/uint128.hpp>
#include <fc/crypto/digest.hpp>

3
libraries/chain/include/graphene/chain/protocol/operations.hpp
View file

@ -44,8 +44,7 @@
#include <graphene/chain/protocol/event.hpp>
#include <graphene/chain/protocol/betting_market.hpp>
#include <graphene/chain/protocol/tournament.hpp>
#include <graphene/chain/btc-sidechain/son_operations.hpp>
#include <graphene/chain/protocol/son.hpp>
namespace graphene { namespace chain {

0
libraries/chain/include/graphene/chain/btc-sidechain/son_operations.hpp → libraries/chain/include/graphene/chain/protocol/son.hpp
View file

2
libraries/chain/include/graphene/chain/btc-sidechain/son_operations_evaluator.hpp → libraries/chain/include/graphene/chain/son_evaluator.hpp
View file

@ -1,6 +1,6 @@
#pragma once
#include <graphene/chain/evaluator.hpp>
#include <graphene/chain/btc-sidechain/son_operations.hpp>
#include <graphene/chain/protocol/son.hpp>
namespace graphene { namespace chain {

0
libraries/chain/include/graphene/chain/btc-sidechain/son.hpp → libraries/chain/include/graphene/chain/son_object.hpp
View file

4
libraries/chain/btc-sidechain/son_operations_evaluator.cpp → libraries/chain/son_evaluator.cpp
View file

@ -1,7 +1,7 @@
#include <graphene/chain/btc-sidechain/son_operations_evaluator.hpp>
#include <graphene/chain/son_evaluator.hpp>
#include <graphene/chain/database.hpp>
#include <graphene/chain/btc-sidechain/son.hpp>
#include <graphene/chain/son_object.hpp>
namespace graphene { namespace chain {

4
tests/CMakeLists.txt
View file

@ -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 )

17
tests/btc_sidechain_tests/main.cpp
View file

@ -1,17 +0,0 @@
#include <cstdlib>
#include <iostream>
#include <boost/test/included/unit_test.hpp>
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;
}

4
tests/btc_sidechain_tests/son_operations_tests.cpp → tests/tests/son_operations_tests.cpp
View file

@ -4,8 +4,8 @@
#include "../common/database_fixture.hpp"
#include <graphene/chain/btc-sidechain/son.hpp>
#include <graphene/chain/btc-sidechain/son_operations_evaluator.hpp>
#include <graphene/chain/son_object.hpp>
#include <graphene/chain/son_evaluator.hpp>
using namespace graphene::chain;
using namespace graphene::chain::test;