diff --git a/libraries/chain/db_bet.cpp b/libraries/chain/db_bet.cpp index 8c3e1357..367a6a73 100644 --- a/libraries/chain/db_bet.cpp +++ b/libraries/chain/db_bet.cpp @@ -476,7 +476,8 @@ int match_bet(database& db, const bet_object& taker_bet, const bet_object& maker share_type maximum_factor = std::min(maximum_taker_factor, maximum_maker_factor); share_type maker_amount_to_match = maximum_factor * maker_odds_ratio; share_type taker_amount_to_match = maximum_factor * taker_odds_ratio; - fc_idump(fc::logger::get("betting"), (maker_amount_to_match)(taker_amount_to_match)); + //TODO + //fc_idump(fc::logger::get("betting"), (maker_amount_to_match)(taker_amount_to_match)); // TODO: analyze whether maximum_maker_amount_to_match can ever be zero here assert(maker_amount_to_match != 0); @@ -554,7 +555,8 @@ int match_bet(database& db, const bet_object& taker_bet, const bet_object& maker ("taker_refund_amount", taker_refund_amount) ("maker_odds", maker_bet.backer_multiplier) ("taker_odds", taker_bet.backer_multiplier)); - fc_ddump(fc::logger::get("betting"), (taker_bet)); + // TODO + //fc_ddump(fc::logger::get("betting"), (taker_bet)); db.adjust_balance(taker_bet.bettor_id, asset(taker_refund_amount, taker_bet.amount_to_bet.asset_id)); // TODO: update global statistics @@ -635,8 +637,9 @@ bool database::place_bet(const bet_object& new_bet_object) // we continue if the maker bet was completely consumed AND the taker bet was not finished = orders_matched_flags != 2; } - if (!(orders_matched_flags & 1)) - fc_ddump(fc::logger::get("betting"), (new_bet_object)); + //TODO + //if (!(orders_matched_flags & 1)) + // fc_ddump(fc::logger::get("betting"), (new_bet_object)); // return true if the taker bet was completely consumed diff --git a/libraries/chain/include/graphene/chain/protocol/sport.hpp b/libraries/chain/include/graphene/chain/protocol/sport.hpp index c9e3673b..3c710d83 100644 --- a/libraries/chain/include/graphene/chain/protocol/sport.hpp +++ b/libraries/chain/include/graphene/chain/protocol/sport.hpp @@ -25,6 +25,7 @@ #include #include +#include namespace graphene { namespace chain { diff --git a/libraries/chain/sport_evaluator.cpp b/libraries/chain/sport_evaluator.cpp index 87648322..b074168b 100644 --- a/libraries/chain/sport_evaluator.cpp +++ b/libraries/chain/sport_evaluator.cpp @@ -32,9 +32,9 @@ namespace graphene { namespace chain { -bool is_manager( const sport_id_type sport_id, const account_id_type manager_id ) +bool is_manager( const database& db, const sport_id_type sport_id, const account_id_type manager_id ) { - return db().get(sport_id).manager == manager_id; + return db.get(sport_id).manager == manager_id; } void_result sport_create_evaluator::do_evaluate(const sport_create_operation& op) @@ -51,7 +51,7 @@ object_id_type sport_create_evaluator::do_apply(const sport_create_operation& op db().create( [&]( sport_object& sport_obj ) { sport_obj.name = op.name; if( op.extensions.value.manager.valid() ) - sport_obj.manager = *op.extesions.value.manager; + sport_obj.manager = *op.extensions.value.manager; }); return new_sport.id; } FC_CAPTURE_AND_RETHROW( (op) ) } @@ -61,7 +61,7 @@ void_result sport_update_evaluator::do_evaluate(const sport_update_operation& op { try { FC_ASSERT(db().head_block_time() >= HARDFORK_1000_TIME); FC_ASSERT(trx_state->_is_proposed_trx - || op.extensions.value.manager.valid() ? is_manager( op.sport_id, *op.extensions.value.manager ) : false ); + || ( op.extensions.value.manager.valid() ? is_manager( db(), op.sport_id, *op.extensions.value.manager ) : false ) ); FC_ASSERT(op.new_name.valid()); return void_result();