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

Progress #127 - importing balances

Browse source
This commit is contained in:
Daniel Larimer 2015-07-02 11:18:52 -04:00
parent 3d220e0df6
commit 68fabe1464
3 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/chain/operations.cpp
View file

@ -953,6 +953,7 @@ void balance_claim_operation::get_required_auth(flat_set<account_id_type>& acti
void balance_claim_operation::validate()const void balance_claim_operation::validate()const
{ {
FC_ASSERT( fee == asset() ); FC_ASSERT( fee == asset() );
FC_ASSERT( balance_owner_key != public_key_type() );
} }

1
libraries/wallet/wallet.cpp
View file

@ -2262,6 +2262,7 @@ signed_transaction wallet_api::import_balance( string name_or_id, const vector<s
{ {
op.total_claimed = b.vesting_policy.valid()? asset(0, b.balance.asset_id) : b.balance; op.total_claimed = b.vesting_policy.valid()? asset(0, b.balance.asset_id) : b.balance;
op.balance_to_claim = b.id; op.balance_to_claim = b.id;
op.balance_owner_key = keys[b.owner].get_public_key();
trx.operations.push_back(op); trx.operations.push_back(op);
required_addrs.insert(b.owner); required_addrs.insert(b.owner);
} }

1
tests/tests/operation_tests.cpp
View file

@ -1107,7 +1107,6 @@ BOOST_AUTO_TEST_CASE( witness_withdraw_pay_test )
const asset_object* core = &asset_id_type()(db); const asset_object* core = &asset_id_type()(db);
const account_object* nathan = &get_account("nathan"); const account_object* nathan = &get_account("nathan");
idump((*nathan));
enable_fees(105000000); enable_fees(105000000);
BOOST_CHECK_GT(db.current_fee_schedule().membership_lifetime_fee, 0); BOOST_CHECK_GT(db.current_fee_schedule().membership_lifetime_fee, 0);
// Based on the size of the reserve fund later in the test, the witness budget will be set to this value // Based on the size of the reserve fund later in the test, the witness budget will be set to this value