Skip to content

Commit

Permalink
fix TxnPoolTest
Browse files Browse the repository at this point in the history
  • Loading branch information
AionJayT committed Feb 27, 2020
1 parent 4693b27 commit f620a93
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions modTxPool/test/org/aion/txpool/TxnPoolTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ private PooledTransaction genTransactionRandomPrice(byte[] nonce, ECKey key, lon
@Test
public void timeout1() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "10"); // 10 sec
config.put(TxPoolA0.PROP_TX_TIMEOUT, "10"); // 10 sec

TxPoolA0 tp = new TxPoolA0(config);
List<PooledTransaction> txnl = getMockTransaction(30000L);
Expand All @@ -295,7 +295,7 @@ public void timeout1() {
@Test
public void timeout2() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "1"); // still 10 sec
config.put(TxPoolA0.PROP_TX_TIMEOUT, "1"); // still 10 sec

TxPoolA0 tp = new TxPoolA0(config);
List<PooledTransaction> txnl = getMockTransaction(30000L);
Expand All @@ -308,7 +308,7 @@ public void timeout2() {
@Test
public void snapshot() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "10"); // 10 sec
config.put(TxPoolA0.PROP_TX_TIMEOUT, "10"); // 10 sec

ITxPool tp = new TxPoolA0(config);
List<PooledTransaction> txnl = getMockTransaction(0);
Expand All @@ -321,7 +321,7 @@ public void snapshot() {
@Test
public void snapshot2() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "100"); // 100 sec
config.put(TxPoolA0.PROP_TX_TIMEOUT, "100"); // 100 sec

ITxPool tp = new TxPoolA0(config);
List<PooledTransaction> txl = new ArrayList<>();
Expand All @@ -341,7 +341,7 @@ public void snapshot2() {
@Test
public void snapshot3() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "100");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "100");

TxPoolA0 tp = new TxPoolA0(config);

Expand Down Expand Up @@ -369,7 +369,7 @@ public void snapshot3() {
@Test
public void snapshot4() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "100");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "100");

TxPoolA0 tp = new TxPoolA0(config);

Expand Down Expand Up @@ -397,7 +397,7 @@ public void snapshot4() {
@Test
public void snapshot5() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "100");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "100");

TxPoolA0 tp = new TxPoolA0(config);

Expand Down Expand Up @@ -427,7 +427,7 @@ public void snapshot5() {
@Test
public void snapshot6() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "100");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "100");

TxPoolA0 tp = new TxPoolA0(config);

Expand Down Expand Up @@ -457,7 +457,7 @@ public void snapshot6() {
@Test
public void snapshot7() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "100");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "100");

TxPoolA0 tp = new TxPoolA0(config);

Expand Down Expand Up @@ -488,7 +488,7 @@ public void snapshot7() {
@Test
public void snapshot8() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "100");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "100");

TxPoolA0 tp = new TxPoolA0(config);

Expand Down Expand Up @@ -519,7 +519,7 @@ public void snapshot8() {
@Test
public void snapshot9() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "100");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "100");

TxPoolA0 tp = new TxPoolA0(config);

Expand Down Expand Up @@ -564,7 +564,7 @@ public void snapshot9() {
@Test
public void snapshot10() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "100");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "100");

TxPoolA0 tp = new TxPoolA0(config);

Expand Down Expand Up @@ -624,7 +624,7 @@ public void snapshot10() {
@Test
public void snapshotWithSameTransactionTimestamp() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "100");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "100");

TxPoolA0 tp = new TxPoolA0(config);

Expand Down Expand Up @@ -689,7 +689,7 @@ public void snapshotWithSameTransactionTimestamp() {
@Test
public void addRepeatedTxn() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "10");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "10");

ITxPool tp = new TxPoolA0(config);
AionTransaction txn =
Expand All @@ -716,7 +716,7 @@ public void addRepeatedTxn() {
@Test
public void addRepeatedTxn2() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "10");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "10");

ITxPool tp = new TxPoolA0(config);

Expand Down Expand Up @@ -747,7 +747,7 @@ public void addRepeatedTxn2() {
@Test
public void addRepeatedTxn3() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "10");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "10");

ITxPool tp = new TxPoolA0(config);

Expand Down Expand Up @@ -779,7 +779,7 @@ public void addRepeatedTxn3() {
@Test
public void addTxWithSameNonce() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "10");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "10");
ITxPool tp = new TxPoolA0(config);

PooledTransaction pooledTx = genTransaction(BigInteger.ONE.toByteArray(), MIN_ENERGY_CONSUME + 100);
Expand All @@ -800,7 +800,7 @@ public void addTxWithSameNonce() {
@Test
public void noncebyAccountTest() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "10");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "10");

TxPoolA0 tp = new TxPoolA0(config);

Expand Down Expand Up @@ -842,7 +842,7 @@ public void noncebyAccountTest() {
@Test
public void noncebyAccountTest2() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "10");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "10");

TxPoolA0 tp = new TxPoolA0(config);

Expand Down Expand Up @@ -886,7 +886,7 @@ public void noncebyAccountTest2() {
@Test
public void feemapTest() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "10");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "10");

TxPoolA0 tp = new TxPoolA0(config);

Expand Down Expand Up @@ -928,7 +928,7 @@ public void feemapTest() {
@Test
public void TxnfeeCombineTest() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "100");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "100");

TxPoolA0 tp = new TxPoolA0(config);

Expand Down Expand Up @@ -957,7 +957,7 @@ public void TxnfeeCombineTest() {
@Test
public void TxnfeeCombineTest2() {
Properties config = new Properties();
config.put(TXPOOL_PROPERTY.PROP_TX_TIMEOUT, "100");
config.put(TxPoolA0.PROP_TX_TIMEOUT, "100");

TxPoolA0 tp = new TxPoolA0(config);

Expand Down

0 comments on commit f620a93

Please sign in to comment.