Add test for FastRawTransactionManager.resetNonce

Signed-off-by: Junsung Cho <[email protected]>
hyperledger-web3j · Aug 8, 2024 · 2582953 · 2582953
1 parent f34ea4b
commit 2582953
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 1 deletion.
diff --git a/core/src/main/java/org/web3j/tx/FastRawTransactionManager.java b/core/src/main/java/org/web3j/tx/FastRawTransactionManager.java
@@ -73,7 +73,7 @@ public BigInteger getCurrentNonce() {
     }
 
     public synchronized void resetNonce() throws IOException {
-        nonce = super.getNonce().subtract(BigInteger.ONE);
+        nonce = super.getNonce(); //.subtract(BigInteger.ONE);
     }
 
     public synchronized void clearNonce() {

diff --git a/...gration-tests/src/test/java/org/web3j/protocol/scenarios/FastRawTransactionManagerIT.java b/...gration-tests/src/test/java/org/web3j/protocol/scenarios/FastRawTransactionManagerIT.java
@@ -96,6 +96,57 @@ public void testTransactionPolling() throws Exception {
         assertTrue(transactionReceipts.isEmpty());
     }
 
+    @Test
+    public void testTransactionPollingResetNonce() throws Exception {
+
+        List<Future<TransactionReceipt>> transactionReceipts = new LinkedList<>();
+        FastRawTransactionManager transactionManager =
+                new FastRawTransactionManager(
+                        web3j,
+                        ALICE,
+                        new PollingTransactionReceiptProcessor(
+                                web3j, POLLING_FREQUENCY, DEFAULT_POLLING_ATTEMPTS_PER_TX_HASH));
+
+        Transfer transfer = new Transfer(web3j, transactionManager);
+        BigInteger gasPrice = transfer.requestCurrentGasPrice();
+
+        for (int i = 0; i < COUNT; i++) {
+
+            Future<TransactionReceipt> transactionReceiptFuture =
+                    createTransaction(transfer, gasPrice).sendAsync();
+            transactionReceipts.add(transactionReceiptFuture);
+        }
+
+        transactionManager.resetNonce();
+
+        for (int i = 0; i < COUNT; i++) {
+
+            Future<TransactionReceipt> transactionReceiptFuture =
+                    createTransaction(transfer, gasPrice).sendAsync();
+            transactionReceipts.add(transactionReceiptFuture);
+        }
+
+        for (int i = 0;
+             i < DEFAULT_POLLING_ATTEMPTS_PER_TX_HASH && !transactionReceipts.isEmpty();
+             i++) {
+
+            for (Iterator<Future<TransactionReceipt>> iterator = transactionReceipts.iterator();
+                 iterator.hasNext(); ) {
+                Future<TransactionReceipt> transactionReceiptFuture = iterator.next();
+
+                if (transactionReceiptFuture.isDone()) {
+                    TransactionReceipt transactionReceipt = transactionReceiptFuture.get();
+                    assertFalse(transactionReceipt.getBlockHash().isEmpty());
+                    iterator.remove();
+                }
+            }
+
+            Thread.sleep(POLLING_FREQUENCY);
+        }
+
+        assertTrue(transactionReceipts.isEmpty());
+    }
+
     @Test
     public void testTransactionQueuing() throws Exception {