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

change type for vesting_type in create_vesting_balance

Browse source
This commit is contained in:
gladcow 2019-10-31 15:43:12 +03:00
parent 5457577ec9
commit 53c3ec5b45
3 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/wallet/include/graphene/wallet/wallet.hpp
View file

@ -1439,7 +1439,7 @@ class wallet_api
signed_transaction create_vesting_balance(string owner_account, signed_transaction create_vesting_balance(string owner_account,
string amount, string amount,
string asset_symbol, string asset_symbol,
string vesting_type, vesting_balance_type vesting_type,
bool broadcast = false); bool broadcast = false);
/** /**

15
libraries/wallet/wallet.cpp
View file

@ -2110,7 +2110,7 @@ public:
signed_transaction create_vesting_balance(string owner_account, signed_transaction create_vesting_balance(string owner_account,
string amount, string amount,
string asset_symbol, string asset_symbol,
string vesting_type, vesting_balance_type vesting_type,
bool broadcast /* = false */) bool broadcast /* = false */)
{ try { { try {
account_object son_account = get_account(owner_account); account_object son_account = get_account(owner_account);
@ -2121,16 +2121,7 @@ public:
op.creator = son_account.get_id(); op.creator = son_account.get_id();
op.owner = son_account.get_id(); op.owner = son_account.get_id();
op.amount = asset_obj->amount_from_string(amount); op.amount = asset_obj->amount_from_string(amount);
if (vesting_type == "normal") op.balance_type = vesting_type;
op.balance_type = vesting_balance_type::normal;
else if (vesting_type == "gpos")
op.balance_type = vesting_balance_type::gpos;
else if (vesting_type == "son")
op.balance_type = vesting_balance_type::son;
else
{
FC_ASSERT( false, "unknown vesting type value ${vt}", ("vt", vesting_type) );
}
if (op.balance_type == vesting_balance_type::son) if (op.balance_type == vesting_balance_type::son)
op.policy = dormant_vesting_policy_initializer {}; op.policy = dormant_vesting_policy_initializer {};
@ -4277,7 +4268,7 @@ committee_member_object wallet_api::get_committee_member(string owner_account)
signed_transaction wallet_api::create_vesting_balance(string owner_account, signed_transaction wallet_api::create_vesting_balance(string owner_account,
string amount, string amount,
string asset_symbol, string asset_symbol,
string vesting_type, vesting_balance_type vesting_type,
bool broadcast /* = false */) bool broadcast /* = false */)
{ {
return my->create_vesting_balance(owner_account, amount, asset_symbol, vesting_type, broadcast); return my->create_vesting_balance(owner_account, amount, asset_symbol, vesting_type, broadcast);

4
tests/cli/son.cpp
View file

@ -79,11 +79,11 @@ public:
// create deposit vesting // create deposit vesting
fixture_.con.wallet_api_ptr->create_vesting_balance(account_name, fixture_.con.wallet_api_ptr->create_vesting_balance(account_name,
"50", "1.3.0", "son", true); "50", "1.3.0", vesting_balance_type::son, true);
BOOST_CHECK(fixture_.generate_block()); BOOST_CHECK(fixture_.generate_block());
// create pay_vb vesting // create pay_vb vesting
fixture_.con.wallet_api_ptr->create_vesting_balance(account_name, "1", "1.3.0", "normal", true); fixture_.con.wallet_api_ptr->create_vesting_balance(account_name, "1", "1.3.0", vesting_balance_type::normal, true);
BOOST_CHECK(fixture_.generate_block()); BOOST_CHECK(fixture_.generate_block());
// check deposits are here // check deposits are here