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

Merge branch 'develop' into feature/313-son-deposit-manually

Browse source
This commit is contained in:
Vlad Dobromyslov 2022-03-07 18:30:48 +03:00
commit d19520c186
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/fc

@ -1 +1 @@
Subproject commit 1cc740598f5b7ec480ac76f60e19d0ccb1e1ac97 Subproject commit 6171e973c7fcfc9e0a39eaee2f05da84416a90e6

6
tests/cli/son.cpp
View file

@ -60,8 +60,14 @@ public:
create_tx = fixture_.con.wallet_api_ptr->create_account_with_brain_key( create_tx = fixture_.con.wallet_api_ptr->create_account_with_brain_key(
bki.brain_priv_key, account_name, "nathan", "nathan", true bki.brain_priv_key, account_name, "nathan", "nathan", true
); );
fixture_.generate_block();
// save the private key for this new account in the wallet file // save the private key for this new account in the wallet file
BOOST_CHECK(fixture_.con.wallet_api_ptr->import_key(account_name, bki.wif_priv_key)); BOOST_CHECK(fixture_.con.wallet_api_ptr->import_key(account_name, bki.wif_priv_key));
fixture_.generate_block();
fixture_.con.wallet_api_ptr->save_wallet_file(fixture_.con.wallet_filename); fixture_.con.wallet_api_ptr->save_wallet_file(fixture_.con.wallet_filename);
// attempt to give son account some CORE tokens // attempt to give son account some CORE tokens