Merge branch 'develop' into pillar_chain_2t_plus_one

Taraxa-project · Jun 7, 2024 · 1e521e5 · 1e521e5
2 parents a65c302 + 9e76434
commit 1e521e5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/libraries/core_libs/consensus/src/transaction/transaction_manager.cpp b/libraries/core_libs/consensus/src/transaction/transaction_manager.cpp
@@ -203,9 +203,9 @@ void TransactionManager::saveTransactionsFromDagBlock(SharedTransactions const &
           if (transactions_pool_.erase(tx_hash)) {
             LOG(log_dg_) << "Transaction " << tx_hash << " removed from trx pool ";
             // Transactions are counted when included in DAG
-            trx_count_++;
             accepted_transactions.emplace_back(tx_hash);
           }
+          trx_count_++;
         }
       }
     }

diff --git a/tests/full_node_test.cpp b/tests/full_node_test.cpp
@@ -861,7 +861,6 @@ TEST_F(FullNodeTest, sync_two_nodes1) {
   for (const auto &trx : samples::createSignedTrxSamples(1, 400, g_secret)) {
     nodes[0]->getTransactionManager()->insertTransaction(trx);
   }
-  taraxa::thisThreadSleepForMilliSeconds(500);
   for (const auto &trx : samples::createSignedTrxSamples(401, 1000, g_secret)) {
     nodes[1]->getTransactionManager()->insertTransaction(trx);
   }
@@ -902,7 +901,6 @@ TEST_F(FullNodeTest, persist_counter) {
     for (const auto &trx : samples::createSignedTrxSamples(1, 400, g_secret)) {
       nodes[0]->getTransactionManager()->insertTransaction(trx);
     }
-    taraxa::thisThreadSleepForMilliSeconds(500);
     for (const auto &trx : samples::createSignedTrxSamples(401, 1000, g_secret)) {
       nodes[1]->getTransactionManager()->insertTransaction(trx);
     }