From 6abdd28aa5ec2758c045789e65ec2931d8a70c42 Mon Sep 17 00:00:00 2001 From: Dimitrios Siganos Date: Thu, 18 Apr 2024 16:01:40 +0900 Subject: [PATCH] Fix TSAN issue... maybe --- nano/core_test/active_transactions.cpp | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/nano/core_test/active_transactions.cpp b/nano/core_test/active_transactions.cpp index bf930f8875..dfd7ba0626 100644 --- a/nano/core_test/active_transactions.cpp +++ b/nano/core_test/active_transactions.cpp @@ -1035,20 +1035,27 @@ TEST (active_transactions, confirm_new) { nano::test::system system (1); auto & node1 = *system.nodes[0]; - auto send = nano::send_block_builder () - .previous (nano::dev::genesis->hash ()) - .destination (nano::public_key ()) - .balance (nano::dev::constants.genesis_amount - 100) - .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) - .work (*system.work.generate (nano::dev::genesis->hash ())) - .build (); - node1.process_active (send); + auto send1 = nano::send_block_builder () + .previous (nano::dev::genesis->hash ()) + .destination (nano::public_key ()) + .balance (nano::dev::constants.genesis_amount - 100) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) + .work (*system.work.generate (nano::dev::genesis->hash ())) + .build (); + auto send2 = nano::send_block_builder () + .previous (nano::dev::genesis->hash ()) + .destination (nano::public_key ()) + .balance (nano::dev::constants.genesis_amount - 100) + .sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub) + .work (*system.work.generate (nano::dev::genesis->hash ())) + .build (); + node1.process_active (send1); ASSERT_TIMELY_EQ (5s, 1, node1.active.size ()); auto & node2 = *system.add_node (); // Add key to node2 system.wallet (1)->insert_adhoc (nano::dev::genesis_key.prv); // Let node2 know about the block - ASSERT_TIMELY (5s, node2.block (send->hash ())); + ASSERT_TIMELY (5s, node2.block (send2->hash ())); // Wait confirmation ASSERT_TIMELY (5s, node1.ledger.cemented_count () == 2); ASSERT_TIMELY (5s, node2.ledger.cemented_count () == 2);