Skip to content

Commit

Permalink
Add check nonce after reset
Browse files Browse the repository at this point in the history
Signed-off-by: Junsung Cho <[email protected]>
  • Loading branch information
junsung-cho committed Aug 10, 2024
1 parent 0042806 commit 32b828c
Showing 1 changed file with 25 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,9 @@
*/
package org.web3j.protocol.scenarios;

import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Future;

import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

import org.web3j.EVMTest;
import org.web3j.NodeType;
import org.web3j.protocol.Web3j;
Expand All @@ -38,9 +27,17 @@
import org.web3j.tx.response.QueuingTransactionReceiptProcessor;
import org.web3j.utils.Convert;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Future;

import static org.junit.jupiter.api.Assertions.*;
import static org.web3j.tx.TransactionManager.DEFAULT_POLLING_ATTEMPTS_PER_TX_HASH;

@EVMTest(type = NodeType.BESU)
Expand Down Expand Up @@ -77,11 +74,11 @@ public void testTransactionPolling() throws Exception {
}

for (int i = 0;
i < DEFAULT_POLLING_ATTEMPTS_PER_TX_HASH && !transactionReceipts.isEmpty();
i++) {
i < DEFAULT_POLLING_ATTEMPTS_PER_TX_HASH && !transactionReceipts.isEmpty();
i++) {

for (Iterator<Future<TransactionReceipt>> iterator = transactionReceipts.iterator();
iterator.hasNext(); ) {
iterator.hasNext(); ) {
Future<TransactionReceipt> transactionReceiptFuture = iterator.next();

if (transactionReceiptFuture.isDone()) {
Expand Down Expand Up @@ -111,8 +108,15 @@ public void testTransactionResetNonce() throws Exception {

createTransaction(transfer, gasPrice).send();
createTransaction(transfer, gasPrice).send();

BigInteger expected = transactionManager.getCurrentNonce();

transactionManager.resetNonce();

BigInteger actual = transactionManager.getCurrentNonce();
createTransaction(transfer, gasPrice).send();

assertEquals(expected, actual);
}

@Test
Expand All @@ -135,7 +139,8 @@ public void accept(TransactionReceipt transactionReceipt) {
}

@Override
public void exception(Exception exception) {}
public void exception(Exception exception) {
}
},
DEFAULT_POLLING_ATTEMPTS_PER_TX_HASH,
POLLING_FREQUENCY));
Expand All @@ -150,8 +155,8 @@ public void exception(Exception exception) {}
}

for (int i = 0;
i < DEFAULT_POLLING_ATTEMPTS_PER_TX_HASH && !pendingTransactions.isEmpty();
i++) {
i < DEFAULT_POLLING_ATTEMPTS_PER_TX_HASH && !pendingTransactions.isEmpty();
i++) {
for (TransactionReceipt transactionReceipt : transactionReceipts) {
assertFalse(transactionReceipt.getBlockHash().isEmpty());
pendingTransactions.remove(transactionReceipt.getTransactionHash());
Expand Down

0 comments on commit 32b828c

Please sign in to comment.