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

Fix gcc/clang builds broken by d3c6cbf4de (breaking circular dependency)

Browse source
This commit is contained in:
Eric Frias 2016-02-22 19:34:16 -05:00
parent d3c6cbf4de
commit 567a40170e
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/chain/evaluator.cpp
View file

@ -118,4 +118,14 @@ database& generic_evaluator::db()const { return trx_state->db(); }
_fba.accumulated_fba_fees += core_fee_paid; _fba.accumulated_fba_fees += core_fee_paid;
} ); } );
} }
share_type generic_evaluator::calculate_fee_for_operation(const operation& op) const
{
return db().current_fee_schedule().calculate_fee( op ).amount;
}
void generic_evaluator::db_adjust_balance(const account_id_type& fee_payer, asset fee_from_account)
{
db().adjust_balance(fee_payer, fee_from_account);
}
} } } }

1
libraries/chain/include/graphene/chain/database.hpp
View file

@ -29,6 +29,7 @@
#include <graphene/chain/fork_database.hpp> #include <graphene/chain/fork_database.hpp>
#include <graphene/chain/block_database.hpp> #include <graphene/chain/block_database.hpp>
#include <graphene/chain/genesis_state.hpp> #include <graphene/chain/genesis_state.hpp>
#include <graphene/chain/evaluator.hpp>
#include <graphene/db/object_database.hpp> #include <graphene/db/object_database.hpp>
#include <graphene/db/object.hpp> #include <graphene/db/object.hpp>

14
libraries/chain/include/graphene/chain/evaluator.hpp
View file

@ -25,7 +25,6 @@
#include <graphene/chain/exceptions.hpp> #include <graphene/chain/exceptions.hpp>
#include <graphene/chain/transaction_evaluation_state.hpp> #include <graphene/chain/transaction_evaluation_state.hpp>
#include <graphene/chain/protocol/operations.hpp> #include <graphene/chain/protocol/operations.hpp>
#include <graphene/chain/database.hpp>
namespace graphene { namespace chain { namespace graphene { namespace chain {
@ -103,6 +102,12 @@ namespace graphene { namespace chain {
*/ */
void pay_fba_fee( uint64_t fba_id ); void pay_fba_fee( uint64_t fba_id );
// the next two functions are helpers that allow template functions declared in this
// header to call db() without including database.hpp, which would
// cause a circular dependency
share_type calculate_fee_for_operation(const operation& op) const;
void db_adjust_balance(const account_id_type& fee_payer, asset fee_from_account);
asset fee_from_account; asset fee_from_account;
share_type core_fee_paid; share_type core_fee_paid;
const account_object* fee_paying_account = nullptr; const account_object* fee_paying_account = nullptr;
@ -144,10 +149,11 @@ namespace graphene { namespace chain {
prepare_fee(op.fee_payer(), op.fee); prepare_fee(op.fee_payer(), op.fee);
if( !trx_state->skip_fee_schedule_check ) if( !trx_state->skip_fee_schedule_check )
{ {
GRAPHENE_ASSERT( core_fee_paid >= db().current_fee_schedule().calculate_fee( op ).amount, share_type required_fee = calculate_fee_for_operation(op);
GRAPHENE_ASSERT( core_fee_paid >= required_fee,
insufficient_fee, insufficient_fee,
"Insufficient Fee Paid", "Insufficient Fee Paid",
("core_fee_paid",core_fee_paid)("required",db().current_fee_schedule().calculate_fee( op ).amount) ); ("core_fee_paid",core_fee_paid)("required", required_fee) );
} }
return eval->do_evaluate(op); return eval->do_evaluate(op);
@ -163,7 +169,7 @@ namespace graphene { namespace chain {
auto result = eval->do_apply(op); auto result = eval->do_apply(op);
db().adjust_balance(op.fee_payer(), -fee_from_account); db_adjust_balance(op.fee_payer(), -fee_from_account);
return result; return result;
} }