Merge pull request #65 from bloxbean/fix/tx-submission-fifo-dequeueing-2

Fixing removal of TX from FIFO queue
bloxbean · Apr 18, 2024 · a4080ca · a4080ca
2 parents 88bd2e9 + a45c1e8
commit a4080ca
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/...src/main/java/com/bloxbean/cardano/yaci/core/protocol/txsubmission/TxSubmissionAgent.java b/...src/main/java/com/bloxbean/cardano/yaci/core/protocol/txsubmission/TxSubmissionAgent.java
@@ -80,11 +80,8 @@ private ReplyTxs getReplyTxs() {
             return new ReplyTxs();
 
         ReplyTxs replyTxs = new ReplyTxs();
-        requestedTxIds.forEach(txId -> removeTxIdAndHash(txId).ifPresent(txSubmissionRequest -> replyTxs.addTx(txSubmissionRequest.getTxnBytes())));
+        requestedTxIds.forEach(txId -> findTxIdAndHash(txId).ifPresent(txSubmissionRequest -> replyTxs.addTx(txSubmissionRequest.getTxnBytes())));
 
-        // Ids of requested TXs don't seem to be acked from server.
-        // Removing them right away now.
-        requestedTxIds.forEach(pendingTxIds::remove);
         if (log.isDebugEnabled())
             log.debug("Txs: {}", replyTxs.getTxns().size());
         return replyTxs;
@@ -161,8 +158,6 @@ private void removeAcknowledgedTxs(int numAcknowledgedTransactions) {
                 if (txHash != null) {
                     // remove from map
                     removeTxIdAndHash(txHash);
-                    // removed from queue
-                    pendingTxIds.remove(txHash);
                 }
             }