Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fixing merge conflicts and bounding test iterations.

Browse source
This commit is contained in:
clemahieu 2018-08-06 11:57:39 +01:00
commit cb340c5031
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rai/core_test/conflicts.cpp
View file

@ -98,12 +98,17 @@ TEST (conflicts, rollback_source)
auto send5 (std::make_shared<rai::state_block> (rai::test_genesis_key.pub, send1->hash (), rai::test_genesis_key.pub, rai::genesis_amount - 3 * rai::Gxrb_ratio, key1.pub, rai::test_genesis_key.prv, rai::test_genesis_key.pub, system.work.generate(send1->hash ())));
ASSERT_EQ (rai::process_result::progress, node1.process(*send5).code);
ASSERT_FALSE (node1.active.start (send5));
auto iterations (0);
while (!node2.active.active(*send4))
{
system.poll ();
++iterations;
ASSERT_LT (iterations, 200);
}
while (node2.active.active(*send4))
{
system.poll ();
++iterations;
ASSERT_LT (iterations, 200);
}
}

4
rai/node/node.cpp
View file

@ -3474,8 +3474,8 @@ void rai::election::broadcast_winner (MDB_txn * transaction_a)
{
if (node.ledger.could_fit (transaction_a, *status.winner))
{
compute_rep_votes (transaction);
node.network.republish_block (transaction, status.winner);
compute_rep_votes (transaction_a);
node.network.republish_block (transaction_a, status.winner);
}
else
{