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

Fix rebase

Browse source
This commit is contained in:
Fabian Schuh 2018-10-11 13:36:49 +02:00
parent 9e624bd2c8
commit fc21e79206
No known key found for this signature in database
GPG key ID: F2538A4B282D6238
4 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/chain/db_bet.cpp
View file

@ -307,6 +307,8 @@ void database::settle_betting_market_group(const betting_market_group_object& be
fc_dlog(fc::logger::get("betting"), "removing betting market group ${id}", ("id", betting_market_group.id)); fc_dlog(fc::logger::get("betting"), "removing betting market group ${id}", ("id", betting_market_group.id));
remove(betting_market_group); remove(betting_market_group);
payout_helper.commit();
} }
void database::remove_completed_events() void database::remove_completed_events()
@ -330,8 +332,6 @@ void database::remove_completed_events()
fc_dlog(fc::logger::get("betting"), "removing settled event ${id}", ("id", event.id)); fc_dlog(fc::logger::get("betting"), "removing settled event ${id}", ("id", event.id));
remove(event); remove(event);
} }
payout_helper.commit();
} }
share_type adjust_betting_position(database& db, share_type adjust_betting_position(database& db,

31
libraries/chain/proposal_evaluator.cpp
View file

@ -55,21 +55,21 @@ struct proposal_operation_hardfork_visitor
"Parameter extensions are not allowed yet!" ); "Parameter extensions are not allowed yet!" );
} }
void operator()(const graphene::chain::tournament_payout_operation &o) const { void operator()(const graphene::chain::tournament_payout_operation &o) const {
// TODO: move check into tournament_payout_operation::validate after HARDFORK_999_TIME // TODO: move check into tournament_payout_operation::validate after HARDFORK_999_TIME
FC_ASSERT( block_time < HARDFORK_999_TIME, "Not allowed!" ); FC_ASSERT( block_time < HARDFORK_999_TIME, "Not allowed!" );
} }
void operator()(const graphene::chain::asset_settle_cancel_operation &o) const { void operator()(const graphene::chain::asset_settle_cancel_operation &o) const {
// TODO: move check into asset_settle_cancel_operation::validate after HARDFORK_999_TIME // TODO: move check into asset_settle_cancel_operation::validate after HARDFORK_999_TIME
FC_ASSERT( block_time < HARDFORK_999_TIME, "Not allowed!" ); FC_ASSERT( block_time < HARDFORK_999_TIME, "Not allowed!" );
} }
void operator()(const graphene::chain::account_create_operation &aco) const { void operator()(const graphene::chain::account_create_operation &aco) const {
// TODO: remove after HARDFORK_999_TIME // TODO: remove after HARDFORK_999_TIME
if (block_time < HARDFORK_999_TIME) if (block_time < HARDFORK_999_TIME)
FC_ASSERT( !aco.extensions.value.affiliate_distributions.valid(), "Affiliate reward distributions not allowed yet" ); FC_ASSERT( !aco.extensions.value.affiliate_distributions.valid(), "Affiliate reward distributions not allowed yet" );
} }
void operator()(const sport_update_operation &v) const { void operator()(const sport_update_operation &v) const {
FC_ASSERT( block_time >= HARDFORK_1000_TIME, "sport_update_operation not allowed yet!" ); FC_ASSERT( block_time >= HARDFORK_1000_TIME, "sport_update_operation not allowed yet!" );
@ -135,11 +135,6 @@ struct proposal_operation_hardfork_visitor
FC_ASSERT( block_time >= HARDFORK_1000_TIME, "event_update_status_operation not allowed yet!" ); FC_ASSERT( block_time >= HARDFORK_1000_TIME, "event_update_status_operation not allowed yet!" );
} }
void operator()(const graphene::chain::account_create_operation &aco) const {
if (block_time < HARDFORK_999_TIME)
FC_ASSERT( !aco.extensions.value.affiliate_distributions.valid(), "Affiliate reward distributions not allowed yet" );
}
// loop and self visit in proposals // loop and self visit in proposals
void operator()(const proposal_create_operation &v) const { void operator()(const proposal_create_operation &v) const {
for (const op_wrapper &op : v.proposed_ops) for (const op_wrapper &op : v.proposed_ops)

4
programs/witness_node/main.cpp
View file

@ -32,7 +32,7 @@
#include <graphene/affiliate_stats/affiliate_stats_plugin.hpp> #include <graphene/affiliate_stats/affiliate_stats_plugin.hpp>
#include <graphene/bookie/bookie_plugin.hpp> #include <graphene/bookie/bookie_plugin.hpp>
#include <graphene/utilities/git_revision.hpp> #include <graphene/utilities/git_revision.hpp>
#include <graphene/snapshot/snapshot.hpp> //#include <graphene/snapshot/snapshot.hpp>
#include <fc/exception/exception.hpp> #include <fc/exception/exception.hpp>
#include <fc/thread/thread.hpp> #include <fc/thread/thread.hpp>
@ -87,7 +87,7 @@ int main(int argc, char** argv) {
auto list_plug = node->register_plugin<accounts_list::accounts_list_plugin>(); auto list_plug = node->register_plugin<accounts_list::accounts_list_plugin>();
auto affiliate_stats_plug = node->register_plugin<affiliate_stats::affiliate_stats_plugin>(); auto affiliate_stats_plug = node->register_plugin<affiliate_stats::affiliate_stats_plugin>();
auto bookie_plug = node->register_plugin<bookie::bookie_plugin>(); auto bookie_plug = node->register_plugin<bookie::bookie_plugin>();
auto snapshot_plug = node->register_plugin<snapshot_plugin::snapshot_plugin>(); // auto snapshot_plug = node->register_plugin<snapshot_plugin::snapshot_plugin>();
try try
{ {

2
tests/tests/affiliate_tests.cpp
View file

@ -537,7 +537,7 @@ BOOST_AUTO_TEST_CASE( bookie_payout_test )
{blackhawks_win_market.id, betting_market_resolution_type::not_win}}); {blackhawks_win_market.id, betting_market_resolution_type::not_win}});
generate_block(); generate_block();
uint16_t rake_fee_percentage = db.get_global_properties().parameters.betting_rake_fee_percentage; uint16_t rake_fee_percentage = db.get_global_properties().parameters.betting_rake_fee_percentage();
BOOST_CHECK_EQUAL( 3 * GRAPHENE_1_PERCENT, rake_fee_percentage ); BOOST_CHECK_EQUAL( 3 * GRAPHENE_1_PERCENT, rake_fee_percentage );
uint32_t rake_value; uint32_t rake_value;
// rake_value = (-10000 + 110000 - 110000) * rake_fee_percentage / GRAPHENE_1_PERCENT / 100; // rake_value = (-10000 + 110000 - 110000) * rake_fee_percentage / GRAPHENE_1_PERCENT / 100;