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

Add more debug messages to failing test

Browse source
This commit is contained in:
serkixenos 2022-08-30 00:43:46 +02:00
parent 27c8126b3f
commit 2871da5d4b
2 changed files with 164 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/wallet/wallet.cpp
View file

@ -2860,7 +2860,6 @@ public:
if (!son_obj)
FC_THROW("Account ${son} is not registered as a SON", ("son", son));
auto insert_result = voting_account_object.options.votes.insert(son_obj->vote_id);
if (!insert_result.second)
FC_THROW("Account ${account} was already voting for SON ${son}", ("account", voting_account)("son", son));
}

43
tests/cli/son.cpp
View file

@ -215,6 +215,8 @@ BOOST_AUTO_TEST_CASE( son_voting )
sidechain_public_keys[sidechain_type::hive] = "hive account 2";
sth.create_son("son2account", "http://son2", sidechain_public_keys);
BOOST_CHECK(generate_maintenance_block());
BOOST_TEST_MESSAGE("Voting for SONs");
son_object son1_obj;
@ -232,7 +234,6 @@ BOOST_AUTO_TEST_CASE( son_voting )
con.wallet_api_ptr->create_vesting_balance("nathan", "1000", "1.3.0", vesting_balance_type::gpos, true);
// Vote for a son1account
BOOST_TEST_MESSAGE("Voting for son1account");
BOOST_CHECK(generate_maintenance_block());
vote_son1_tx = con.wallet_api_ptr->vote_for_son("nathan", "son1account", true, true);
BOOST_CHECK(generate_maintenance_block());
@ -463,6 +464,10 @@ BOOST_AUTO_TEST_CASE( update_son_votes_test )
sidechain_public_keys[sidechain_type::hive] = "hive account 2";
sth.create_son("son2account", "http://son2", sidechain_public_keys);
BOOST_CHECK(generate_maintenance_block());
BOOST_TEST_MESSAGE("Vote for 2 accounts with update_son_votes");
son_object son1_obj;
son_object son2_obj;
uint64_t son1_start_votes, son1_end_votes;
@ -471,18 +476,13 @@ BOOST_AUTO_TEST_CASE( update_son_votes_test )
// Get votes at start
son1_obj = con.wallet_api_ptr->get_son("son1account");
son1_start_votes = son1_obj.total_votes;
BOOST_TEST_MESSAGE("son1_start_votes: " << son1_start_votes);
son2_obj = con.wallet_api_ptr->get_son("son2account");
son2_start_votes = son2_obj.total_votes;
BOOST_TEST_MESSAGE("son2_start_votes: " << son2_start_votes);
std::vector<std::string> accepted;
std::vector<std::string> rejected;
signed_transaction update_votes_tx;
generate_block();
BOOST_CHECK(generate_maintenance_block());
BOOST_TEST_MESSAGE("Vote for 2 accounts with update_son_votes");
// Vote for both SONs
accepted.clear();
rejected.clear();
@ -497,12 +497,10 @@ BOOST_AUTO_TEST_CASE( update_son_votes_test )
// Verify the votes
son1_obj = con.wallet_api_ptr->get_son("son1account");
son1_end_votes = son1_obj.total_votes;
BOOST_TEST_MESSAGE("son1_end_votes: " << son1_end_votes);
BOOST_CHECK(son1_end_votes > son1_start_votes);
son1_start_votes = son1_end_votes;
son2_obj = con.wallet_api_ptr->get_son("son2account");
son2_end_votes = son2_obj.total_votes;
BOOST_TEST_MESSAGE("son2_end_votes: " << son2_end_votes);
BOOST_CHECK(son2_end_votes > son2_start_votes);
son2_start_votes = son2_end_votes;
@ -519,14 +517,12 @@ BOOST_AUTO_TEST_CASE( update_son_votes_test )
// Verify the votes
son1_obj = con.wallet_api_ptr->get_son("son1account");
son1_end_votes = son1_obj.total_votes;
BOOST_TEST_MESSAGE("son1_end_votes: " << son1_end_votes);
BOOST_CHECK(son1_end_votes < son1_start_votes);
son1_start_votes = son1_end_votes;
son2_obj = con.wallet_api_ptr->get_son("son2account");
// voice distribution changed, SON2 now has all voices
son2_end_votes = son2_obj.total_votes;
BOOST_TEST_MESSAGE("son2_end_votes: " << son2_end_votes);
BOOST_CHECK((son2_end_votes > son2_start_votes)); // nathan spent funds for vb, it has different voting power
son2_start_votes = son2_end_votes;
@ -660,7 +656,7 @@ BOOST_FIXTURE_TEST_CASE( cli_list_active_sons, cli_fixture )
flat_map<sidechain_type, string> sidechain_public_keys;
// create son accounts
for(unsigned int i = 0; i < son_number + 1; i++)
for(unsigned int i = 0; i < son_number * 2; i++)
{
sidechain_public_keys.clear();
sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address " + fc::to_pretty_string(i);
@ -669,37 +665,48 @@ BOOST_FIXTURE_TEST_CASE( cli_list_active_sons, cli_fixture )
"http://son" + fc::to_pretty_string(i),
sidechain_public_keys,
false);
con.wallet_api_ptr->transfer(
"nathan", "sonaccount" + fc::to_pretty_string(i), "1000", "1.3.0", "Here are some CORE tokens for your new account", true );
con.wallet_api_ptr->transfer("nathan", "sonaccount" + fc::to_pretty_string(i),
"1000", "1.3.0", "Here are some CORE tokens for your new account", true );
con.wallet_api_ptr->create_vesting_balance("sonaccount" + fc::to_pretty_string(i), "500", "1.3.0", vesting_balance_type::gpos, true);
}
BOOST_CHECK(generate_maintenance_block());
generate_block();
BOOST_TEST_MESSAGE("Voting for SONs");
for(unsigned int i = 1; i < son_number + 1; i++)
for(unsigned int i = 0; i < son_number * 2; i++)
{
std::string name = "sonaccount" + fc::to_pretty_string(i);
BOOST_TEST_MESSAGE("Account " + name + " votes for SON " + name);
vote_tx = con.wallet_api_ptr->vote_for_son(name, name, true, true);
}
BOOST_CHECK(generate_maintenance_block());
generate_block();
for(unsigned int i = 1; i < son_number; i++)
for(unsigned int i = 0; i < son_number; i++)
{
std::string name1 = "sonaccount" + fc::to_pretty_string(i);
std::string name2 = "sonaccount" + fc::to_pretty_string(i + 1);
BOOST_TEST_MESSAGE("Account " + name1 + " votes for SON " + name2);
vote_tx = con.wallet_api_ptr->vote_for_son(name1, name2, true, true);
}
generate_block();
BOOST_CHECK(generate_maintenance_block());
gpo = con.wallet_api_ptr->get_global_properties();
BOOST_TEST_MESSAGE("gpo: " << gpo.active_sons.size());
BOOST_CHECK(gpo.active_sons.size() == son_number);
map<string, son_id_type> active_sons = con.wallet_api_ptr->list_active_sons();
BOOST_TEST_MESSAGE("Active SONs:");
for (auto s : active_sons) {
BOOST_TEST_MESSAGE(" " + s.first);
}
BOOST_CHECK(active_sons.size() == son_number);
for(unsigned int i = 1; i < son_number; i++)
for(unsigned int i = 1; i < son_number + 1; i++)
{
std::string name = "sonaccount" + fc::to_pretty_string(i);
BOOST_TEST_MESSAGE("Looking for SON name: " + name);
BOOST_CHECK(active_sons.find(name) != active_sons.end());
}