diff --git a/libraries/chain/account_object.cpp b/libraries/chain/account_object.cpp index a68c8260..9b89b024 100644 --- a/libraries/chain/account_object.cpp +++ b/libraries/chain/account_object.cpp @@ -136,21 +136,6 @@ void account_statistics_object::pay_fee( share_type core_fee, share_type cashbac pending_vested_fees += core_fee; } -void account_object::options_type::validate() const -{ - auto needed_witnesses = num_witness; - auto needed_committee = num_committee; - - for( vote_id_type id : votes ) - if( id.type() == vote_id_type::witness && needed_witnesses ) - --needed_witnesses; - else if ( id.type() == vote_id_type::committee && needed_committee ) - --needed_committee; - - FC_ASSERT( needed_witnesses == 0 && needed_committee == 0, - "May not specify fewer witnesses or committee members than the number voted for."); -} - set account_member_index::get_account_members(const account_object& a)const { set result; diff --git a/libraries/chain/protocol/account.cpp b/libraries/chain/protocol/account.cpp index 003af663..3742914d 100644 --- a/libraries/chain/protocol/account.cpp +++ b/libraries/chain/protocol/account.cpp @@ -141,6 +141,21 @@ bool is_cheap_name( const string& n ) return false; } +void account_options::validate() const +{ + auto needed_witnesses = num_witness; + auto needed_committee = num_committee; + + for( vote_id_type id : votes ) + if( id.type() == vote_id_type::witness && needed_witnesses ) + --needed_witnesses; + else if ( id.type() == vote_id_type::committee && needed_committee ) + --needed_committee; + + FC_ASSERT( needed_witnesses == 0 && needed_committee == 0, + "May not specify fewer witnesses or committee members than the number voted for."); +} + share_type account_create_operation::calculate_fee( const fee_parameters_type& k )const { auto core_fee_required = k.basic_fee;