diff --git a/libraries/chain/bond_evaluator.cpp b/libraries/chain/bond_evaluator.cpp index c3108771..272866c1 100644 --- a/libraries/chain/bond_evaluator.cpp +++ b/libraries/chain/bond_evaluator.cpp @@ -67,21 +67,21 @@ object_id_type bond_create_offer_evaluator::do_apply( const bond_create_offer_op } -object_id_type bond_cancel_offer_evaluator::do_evaluate( const bond_cancel_offer_operation& op ) +void_result bond_cancel_offer_evaluator::do_evaluate( const bond_cancel_offer_operation& op ) { _offer = &op.offer_id(db()); FC_ASSERT( op.creator == _offer->offered_by_account ); FC_ASSERT( _offer->amount == op.refund ); - return object_id_type(); + return void_result(); } -object_id_type bond_cancel_offer_evaluator::do_apply( const bond_cancel_offer_operation& op ) +void_result bond_cancel_offer_evaluator::do_apply( const bond_cancel_offer_operation& op ) { assert( _offer != nullptr ); db().adjust_balance( op.creator, op.refund ); db().adjust_core_in_orders( op.creator(db()), -op.refund ); db().remove( *_offer ); - return object_id_type(); + return void_result(); } object_id_type bond_accept_offer_evaluator::do_evaluate( const bond_accept_offer_operation& op ) @@ -148,7 +148,7 @@ object_id_type bond_accept_offer_evaluator::do_apply( const bond_accept_offer_op -object_id_type bond_claim_collateral_evaluator::do_evaluate( const bond_claim_collateral_operation& op ) +void_result bond_claim_collateral_evaluator::do_evaluate( const bond_claim_collateral_operation& op ) { _bond = &op.bond_id(db()); auto head_time = db().get_dynamic_global_properties().time; @@ -185,10 +185,10 @@ object_id_type bond_claim_collateral_evaluator::do_evaluate( const bond_claim_co FC_ASSERT( _bond->collateral == op.collateral_claimed ); FC_ASSERT( op.payoff_amount == asset(0,_bond->borrowed.asset_id ) ); } - return object_id_type(); + return void_result(); } -object_id_type bond_claim_collateral_evaluator::do_apply( const bond_claim_collateral_operation& op ) +void_result bond_claim_collateral_evaluator::do_apply( const bond_claim_collateral_operation& op ) { assert( _bond != nullptr ); @@ -212,7 +212,7 @@ object_id_type bond_claim_collateral_evaluator::do_apply( const bond_claim_colla bond.start_date = db().get_dynamic_global_properties().time; }); - return object_id_type(); + return void_result(); } } } // graphene::chain diff --git a/libraries/chain/global_parameters_evaluator.cpp b/libraries/chain/global_parameters_evaluator.cpp index e8094f7d..49b05769 100644 --- a/libraries/chain/global_parameters_evaluator.cpp +++ b/libraries/chain/global_parameters_evaluator.cpp @@ -21,20 +21,20 @@ namespace graphene { namespace chain { -object_id_type global_parameters_update_evaluator::do_evaluate(const global_parameters_update_operation& o) +void_result global_parameters_update_evaluator::do_evaluate(const global_parameters_update_operation& o) { FC_ASSERT(trx_state->_is_proposed_trx); - return object_id_type(); + return void_result(); } -object_id_type global_parameters_update_evaluator::do_apply(const global_parameters_update_operation& o) +void_result global_parameters_update_evaluator::do_apply(const global_parameters_update_operation& o) { db().modify(db().get_global_properties(), [&o](global_property_object& p) { p.pending_parameters = o.new_parameters; }); - return object_id_type(); + return void_result(); } } } // graphene::chain diff --git a/libraries/chain/include/graphene/chain/bond_evaluator.hpp b/libraries/chain/include/graphene/chain/bond_evaluator.hpp index 224c3527..b8114101 100644 --- a/libraries/chain/include/graphene/chain/bond_evaluator.hpp +++ b/libraries/chain/include/graphene/chain/bond_evaluator.hpp @@ -35,8 +35,8 @@ class bond_cancel_offer_evaluator : public evaluatorsigned_by(id) || trx_state->_skip_authority_check ); } - return object_id_type(); + return void_result(); } -object_id_type proposal_update_evaluator::do_apply(const proposal_update_operation& o) +void_result proposal_update_evaluator::do_apply(const proposal_update_operation& o) { database& d = db(); @@ -128,7 +128,7 @@ object_id_type proposal_update_evaluator::do_apply(const proposal_update_operati // If the proposal has a review period, don't bother attempting to authorize/execute it. // Proposals with a review period may never be executed except at their expiration. if( _proposal->review_period_time ) - return object_id_type(); + return void_result(); if( _proposal->is_authorized_to_execute(&d) ) { @@ -143,10 +143,10 @@ object_id_type proposal_update_evaluator::do_apply(const proposal_update_operati } } - return object_id_type(); + return void_result(); } -object_id_type proposal_delete_evaluator::do_evaluate(const proposal_delete_operation& o) +void_result proposal_delete_evaluator::do_evaluate(const proposal_delete_operation& o) { database& d = db(); @@ -158,14 +158,14 @@ object_id_type proposal_delete_evaluator::do_evaluate(const proposal_delete_oper "Provided authority is not authoritative for this proposal.", ("provided", o.fee_paying_account)("required", *required_approvals)); - return object_id_type(); + return void_result(); } -object_id_type proposal_delete_evaluator::do_apply(const proposal_delete_operation&) +void_result proposal_delete_evaluator::do_apply(const proposal_delete_operation&) { db().remove(*_proposal); - return object_id_type(); + return void_result(); } } } // graphene::chain diff --git a/libraries/chain/vesting_balance_evaluator.cpp b/libraries/chain/vesting_balance_evaluator.cpp index e044b515..af521f80 100644 --- a/libraries/chain/vesting_balance_evaluator.cpp +++ b/libraries/chain/vesting_balance_evaluator.cpp @@ -69,7 +69,7 @@ object_id_type vesting_balance_create_evaluator::do_apply( const vesting_balance return vbo.id; } -object_id_type vesting_balance_withdraw_evaluator::do_evaluate( const vesting_balance_withdraw_operation& op ) +void_result vesting_balance_withdraw_evaluator::do_evaluate( const vesting_balance_withdraw_operation& op ) { const database& d = db(); const time_point_sec now = d.head_block_time(); @@ -81,10 +81,10 @@ object_id_type vesting_balance_withdraw_evaluator::do_evaluate( const vesting_ba /* const account_object& owner_account = */ op.owner( d ); // TODO: Check asset authorizations and withdrawals - return object_id_type(); + return void_result(); } -object_id_type vesting_balance_withdraw_evaluator::do_apply( const vesting_balance_withdraw_operation& op ) +void_result vesting_balance_withdraw_evaluator::do_apply( const vesting_balance_withdraw_operation& op ) { database& d = db(); const time_point_sec now = d.head_block_time(); @@ -103,7 +103,7 @@ object_id_type vesting_balance_withdraw_evaluator::do_apply( const vesting_balan d.adjust_balance( op.owner, op.amount ); // TODO: Check asset authorizations and withdrawals - return object_id_type(); + return void_result(); } } } // graphene::chain diff --git a/libraries/chain/witness_evaluator.cpp b/libraries/chain/witness_evaluator.cpp index b8f9a19f..89befa44 100644 --- a/libraries/chain/witness_evaluator.cpp +++ b/libraries/chain/witness_evaluator.cpp @@ -45,7 +45,7 @@ object_id_type witness_create_evaluator::do_apply( const witness_create_operatio return new_witness_object.id; } -object_id_type witness_withdraw_pay_evaluator::do_evaluate(const witness_withdraw_pay_evaluator::operation_type& o) +void_result witness_withdraw_pay_evaluator::do_evaluate(const witness_withdraw_pay_evaluator::operation_type& o) { database& d = db(); @@ -55,10 +55,10 @@ object_id_type witness_withdraw_pay_evaluator::do_evaluate(const witness_withdra ("w", o.amount)("e", witness->accumulated_income) ); to_account = &d.get(o.to_account); - return object_id_type(); + return void_result(); } -object_id_type witness_withdraw_pay_evaluator::do_apply(const witness_withdraw_pay_evaluator::operation_type& o) +void_result witness_withdraw_pay_evaluator::do_apply(const witness_withdraw_pay_evaluator::operation_type& o) { database& d = db(); @@ -68,7 +68,7 @@ object_id_type witness_withdraw_pay_evaluator::do_apply(const witness_withdraw_p w.accumulated_income -= o.amount; }); - return object_id_type(); + return void_result(); } } } // graphene::chain diff --git a/libraries/fc b/libraries/fc index 10e74740..dde8ed9d 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 10e747409c5d656e794cb2e10cc51d5e31978cf1 +Subproject commit dde8ed9d7ab49807f2556488c0815f3741b11e00