From cb340c5031eeb1b0df92ef8320fb0d1785d4caf5 Mon Sep 17 00:00:00 2001 From: clemahieu Date: Mon, 6 Aug 2018 11:57:39 +0100 Subject: [PATCH] Fixing merge conflicts and bounding test iterations. --- rai/core_test/conflicts.cpp | 5 +++++ rai/node/node.cpp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rai/core_test/conflicts.cpp b/rai/core_test/conflicts.cpp index 97899153..52f74c5d 100644 --- a/rai/core_test/conflicts.cpp +++ b/rai/core_test/conflicts.cpp @@ -98,12 +98,17 @@ TEST (conflicts, rollback_source) auto send5 (std::make_shared (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); } } diff --git a/rai/node/node.cpp b/rai/node/node.cpp index 69d06a75..03c6db6f 100644 --- a/rai/node/node.cpp +++ b/rai/node/node.cpp @@ -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 {