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

clean some errors

Browse source
This commit is contained in:
dimfred 2018-10-31 16:26:05 +01:00 committed by Fabian Schuh
parent 2eaa843d26
commit a6a00308f8
No known key found for this signature in database
GPG key ID: F2538A4B282D6238
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/chain/db_bet.cpp
View file

@ -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 maximum_factor = std::min(maximum_taker_factor, maximum_maker_factor);
share_type maker_amount_to_match = maximum_factor * maker_odds_ratio; share_type maker_amount_to_match = maximum_factor * maker_odds_ratio;
share_type taker_amount_to_match = maximum_factor * taker_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 // TODO: analyze whether maximum_maker_amount_to_match can ever be zero here
assert(maker_amount_to_match != 0); 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) ("taker_refund_amount", taker_refund_amount)
("maker_odds", maker_bet.backer_multiplier) ("maker_odds", maker_bet.backer_multiplier)
("taker_odds", taker_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)); db.adjust_balance(taker_bet.bettor_id, asset(taker_refund_amount, taker_bet.amount_to_bet.asset_id));
// TODO: update global statistics // 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 // we continue if the maker bet was completely consumed AND the taker bet was not
finished = orders_matched_flags != 2; finished = orders_matched_flags != 2;
} }
if (!(orders_matched_flags & 1)) //TODO
fc_ddump(fc::logger::get("betting"), (new_bet_object)); //if (!(orders_matched_flags & 1))
// fc_ddump(fc::logger::get("betting"), (new_bet_object));
// return true if the taker bet was completely consumed // return true if the taker bet was completely consumed

1
libraries/chain/include/graphene/chain/protocol/sport.hpp
View file

@ -25,6 +25,7 @@
#include <graphene/chain/protocol/types.hpp> #include <graphene/chain/protocol/types.hpp>
#include <graphene/chain/protocol/base.hpp> #include <graphene/chain/protocol/base.hpp>
#include <graphene/chain/protocol/ext.hpp>
namespace graphene { namespace chain { namespace graphene { namespace chain {

8
libraries/chain/sport_evaluator.cpp
View file

@ -32,9 +32,9 @@
namespace graphene { namespace chain { 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) 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_object& sport_obj ) { db().create<sport_object>( [&]( sport_object& sport_obj ) {
sport_obj.name = op.name; sport_obj.name = op.name;
if( op.extensions.value.manager.valid() ) if( op.extensions.value.manager.valid() )
sport_obj.manager = *op.extesions.value.manager; sport_obj.manager = *op.extensions.value.manager;
}); });
return new_sport.id; return new_sport.id;
} FC_CAPTURE_AND_RETHROW( (op) ) } } FC_CAPTURE_AND_RETHROW( (op) ) }
@ -61,7 +61,7 @@ void_result sport_update_evaluator::do_evaluate(const sport_update_operation& op
{ try { { try {
FC_ASSERT(db().head_block_time() >= HARDFORK_1000_TIME); FC_ASSERT(db().head_block_time() >= HARDFORK_1000_TIME);
FC_ASSERT(trx_state->_is_proposed_trx 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()); FC_ASSERT(op.new_name.valid());
return void_result(); return void_result();