[PAN-1062] Evict old transactions (1 of 2) (PegaSysEng#1299)

notlesh · May 14, 2019 · c0bf672 · c0bf672
1 parent 062ea7a
commit c0bf672
Show file tree

Hide file tree

Showing 14 changed files with 170 additions and 25 deletions.
diff --git a/...est/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreatorTest.java b/...est/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreatorTest.java
@@ -50,12 +50,14 @@
 import tech.pegasys.pantheon.util.bytes.BytesValue;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import com.google.common.collect.Lists;
 import org.junit.Before;
 import org.junit.Test;
 
 public class CliqueBlockCreatorTest {
+  private static final long TRANSACTION_EVICTION_INTERVAL_MS = TimeUnit.MINUTES.toMillis(1);
 
   private final KeyPair proposerKeyPair = KeyPair.generate();
   private final Address proposerAddress = Util.publicKeyToAddress(proposerKeyPair.getPublicKey());
@@ -113,7 +115,8 @@ public void proposerAddressCanBeExtractFromAConstructedBlock() {
         new CliqueBlockCreator(
             coinbase,
             parent -> extraData.encode(),
-            new PendingTransactions(5, TestClock.fixed(), metricsSystem),
+            new PendingTransactions(
+                TRANSACTION_EVICTION_INTERVAL_MS, 5, TestClock.fixed(), metricsSystem),
             protocolContext,
             protocolSchedule,
             gasLimit -> gasLimit,
@@ -140,7 +143,8 @@ public void insertsValidVoteIntoConstructedBlock() {
         new CliqueBlockCreator(
             coinbase,
             parent -> extraData.encode(),
-            new PendingTransactions(5, TestClock.fixed(), metricsSystem),
+            new PendingTransactions(
+                TRANSACTION_EVICTION_INTERVAL_MS, 5, TestClock.fixed(), metricsSystem),
             protocolContext,
             protocolSchedule,
             gasLimit -> gasLimit,
@@ -166,7 +170,8 @@ public void insertsNoVoteWhenAuthInValidators() {
         new CliqueBlockCreator(
             coinbase,
             parent -> extraData.encode(),
-            new PendingTransactions(5, TestClock.fixed(), metricsSystem),
+            new PendingTransactions(
+                TRANSACTION_EVICTION_INTERVAL_MS, 5, TestClock.fixed(), metricsSystem),
             protocolContext,
             protocolSchedule,
             gasLimit -> gasLimit,
@@ -195,7 +200,8 @@ public void insertsNoVoteWhenAtEpoch() {
         new CliqueBlockCreator(
             coinbase,
             parent -> extraData.encode(),
-            new PendingTransactions(5, TestClock.fixed(), metricsSystem),
+            new PendingTransactions(
+                TRANSACTION_EVICTION_INTERVAL_MS, 5, TestClock.fixed(), metricsSystem),
             protocolContext,
             protocolSchedule,
             gasLimit -> gasLimit,

diff --git a/...st/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMinerExecutorTest.java b/...st/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMinerExecutorTest.java
@@ -44,6 +44,7 @@
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 
 import com.google.common.collect.Lists;
 import io.vertx.core.json.JsonObject;
@@ -54,6 +55,7 @@ public class CliqueMinerExecutorTest {
 
   private static final GenesisConfigOptions GENESIS_CONFIG_OPTIONS =
       GenesisConfigFile.fromConfig(new JsonObject()).getConfigOptions();
+  private static final long TRANSACTION_EVICTION_INTERVAL_MS = TimeUnit.MINUTES.toMillis(1);
   private final KeyPair proposerKeyPair = KeyPair.generate();
   private Address localAddress;
   private final List<Address> validatorList = Lists.newArrayList();
@@ -90,7 +92,8 @@ public void extraDataCreatedOnEpochBlocksContainsValidators() {
             cliqueProtocolContext,
             Executors.newSingleThreadExecutor(),
             CliqueProtocolSchedule.create(GENESIS_CONFIG_OPTIONS, proposerKeyPair),
-            new PendingTransactions(1, TestClock.fixed(), metricsSystem),
+            new PendingTransactions(
+                TRANSACTION_EVICTION_INTERVAL_MS, 1, TestClock.fixed(), metricsSystem),
             proposerKeyPair,
             new MiningParameters(AddressHelpers.ofValue(1), Wei.ZERO, wrappedVanityData, false),
             mock(CliqueBlockScheduler.class),
@@ -120,7 +123,8 @@ public void extraDataForNonEpochBlocksDoesNotContainValidaors() {
             cliqueProtocolContext,
             Executors.newSingleThreadExecutor(),
             CliqueProtocolSchedule.create(GENESIS_CONFIG_OPTIONS, proposerKeyPair),
-            new PendingTransactions(1, TestClock.fixed(), metricsSystem),
+            new PendingTransactions(
+                TRANSACTION_EVICTION_INTERVAL_MS, 1, TestClock.fixed(), metricsSystem),
             proposerKeyPair,
             new MiningParameters(AddressHelpers.ofValue(1), Wei.ZERO, wrappedVanityData, false),
             mock(CliqueBlockScheduler.class),

diff --git a/...ntegration-test/java/tech/pegasys/pantheon/consensus/ibft/support/TestContextBuilder.java b/...ntegration-test/java/tech/pegasys/pantheon/consensus/ibft/support/TestContextBuilder.java
@@ -80,11 +80,14 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import com.google.common.collect.Iterables;
 
 public class TestContextBuilder {
+
+  private static final long TRANSACTION_EVICTION_INTERVAL_MS = TimeUnit.MINUTES.toMillis(1);
   private static MetricsSystem metricsSystem = new NoOpMetricsSystem();
 
   private static class ControllerAndState {
@@ -282,10 +285,13 @@ private static ControllerAndState createControllerAndFinalState(
         new ProtocolContext<>(
             blockChain, worldStateArchive, new IbftContext(voteTallyCache, voteProposer));
 
+    final PendingTransactions pendingTransactions =
+        new PendingTransactions(TRANSACTION_EVICTION_INTERVAL_MS, 1, clock, metricsSystem);
+
     final IbftBlockCreatorFactory blockCreatorFactory =
         new IbftBlockCreatorFactory(
             (gasLimit) -> gasLimit,
-            new PendingTransactions(1, clock, metricsSystem), // changed from IbftPantheonController
+            pendingTransactions, // changed from IbftPantheonController
             protocolContext,
             protocolSchedule,
             miningParams,

diff --git a/...rc/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreatorTest.java b/...rc/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreatorTest.java
@@ -46,11 +46,13 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 
 import com.google.common.collect.Lists;
 import org.junit.Test;
 
 public class IbftBlockCreatorTest {
+  private static final long TRANSACTION_EVICTION_INTERVAL_MS = TimeUnit.MINUTES.toMillis(1);
   private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
 
   @Test
@@ -81,6 +83,10 @@ public void createdBlockPassesValidationRulesAndHasAppropriateHashAndMixHash() {
             createInMemoryWorldStateArchive(),
             setupContextWithValidators(initialValidatorList));
 
+    final PendingTransactions pendingTransactions =
+        new PendingTransactions(
+            TRANSACTION_EVICTION_INTERVAL_MS, 1, TestClock.fixed(), metricsSystem);
+
     final IbftBlockCreator blockCreator =
         new IbftBlockCreator(
             initialValidatorList.get(0),
@@ -92,7 +98,7 @@ public void createdBlockPassesValidationRulesAndHasAppropriateHashAndMixHash() {
                         0,
                         initialValidatorList)
                     .encode(),
-            new PendingTransactions(1, TestClock.fixed(), metricsSystem),
+            pendingTransactions,
             protContext,
             protocolSchedule,
             parentGasLimit -> parentGasLimit,

diff --git a/...t/java/tech/pegasys/pantheon/consensus/ibftlegacy/blockcreation/IbftBlockCreatorTest.java b/...t/java/tech/pegasys/pantheon/consensus/ibftlegacy/blockcreation/IbftBlockCreatorTest.java
@@ -46,11 +46,13 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 
 import com.google.common.collect.Lists;
 import org.junit.Test;
 
 public class IbftBlockCreatorTest {
+  private static final long TRANSACTION_EVICTION_INTERVAL_MS = TimeUnit.MINUTES.toMillis(1);
   private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
 
   @Test
@@ -97,7 +99,8 @@ public void headerProducedPassesValidationRules() {
                         null,
                         initialValidatorList)
                     .encode(),
-            new PendingTransactions(1, TestClock.fixed(), metricsSystem),
+            new PendingTransactions(
+                TRANSACTION_EVICTION_INTERVAL_MS, 1, TestClock.fixed(), metricsSystem),
             protContext,
             protocolSchedule,
             parentGasLimit -> parentGasLimit,

diff --git a/.../test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelectorTest.java b/.../test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelectorTest.java
@@ -55,6 +55,7 @@
 import java.math.BigInteger;
 import java.time.Instant;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
 import com.google.common.collect.Lists;
@@ -63,6 +64,7 @@
 public class BlockTransactionSelectorTest {
 
   private static final KeyPair keyPair = KeyPair.generate();
+  private static final long TRANSACTION_EVICTION_INTERVAL_MS = TimeUnit.MINUTES.toMillis(1);
   private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
 
   @Test
@@ -75,7 +77,9 @@ public void emptyPendingTransactionsResultsInEmptyVettingResult() {
     final DefaultMutableWorldState worldState = inMemoryWorldState();
 
     final PendingTransactions pendingTransactions =
-        new PendingTransactions(5, TestClock.fixed(), metricsSystem);
+        new PendingTransactions(
+            TRANSACTION_EVICTION_INTERVAL_MS, 5, TestClock.fixed(), metricsSystem);
+
     final Supplier<Boolean> isCancelled = () -> false;
 
     final ProcessableBlockHeader blockHeader =
@@ -113,7 +117,8 @@ public void emptyPendingTransactionsResultsInEmptyVettingResult() {
   @Test
   public void failedTransactionsAreIncludedInTheBlock() {
     final PendingTransactions pendingTransactions =
-        new PendingTransactions(5, TestClock.fixed(), metricsSystem);
+        new PendingTransactions(
+            TRANSACTION_EVICTION_INTERVAL_MS, 5, TestClock.fixed(), metricsSystem);
 
     final Transaction transaction = createTransaction(1);
     pendingTransactions.addRemoteTransaction(transaction);
@@ -165,7 +170,8 @@ public void failedTransactionsAreIncludedInTheBlock() {
   @Test
   public void invalidTransactionsTransactionProcessingAreSkippedButBlockStillFills() {
     final PendingTransactions pendingTransactions =
-        new PendingTransactions(5, TestClock.fixed(), metricsSystem);
+        new PendingTransactions(
+            TRANSACTION_EVICTION_INTERVAL_MS, 5, TestClock.fixed(), metricsSystem);
 
     final List<Transaction> transactionsToInject = Lists.newArrayList();
     for (int i = 0; i < 5; i++) {
@@ -228,7 +234,8 @@ public void invalidTransactionsTransactionProcessingAreSkippedButBlockStillFills
   @Test
   public void subsetOfPendingTransactionsIncludedWhenBlockGasLimitHit() {
     final PendingTransactions pendingTransactions =
-        new PendingTransactions(5, TestClock.fixed(), metricsSystem);
+        new PendingTransactions(
+            TRANSACTION_EVICTION_INTERVAL_MS, 5, TestClock.fixed(), metricsSystem);
 
     final List<Transaction> transactionsToInject = Lists.newArrayList();
     // Transactions are reported in reverse order.
@@ -294,7 +301,8 @@ public void subsetOfPendingTransactionsIncludedWhenBlockGasLimitHit() {
   @Test
   public void transactionOfferingGasPriceLessThanMinimumIsIdentifiedAndRemovedFromPending() {
     final PendingTransactions pendingTransactions =
-        new PendingTransactions(5, TestClock.fixed(), metricsSystem);
+        new PendingTransactions(
+            TRANSACTION_EVICTION_INTERVAL_MS, 5, TestClock.fixed(), metricsSystem);
 
     final Blockchain blockchain = new TestBlockchain();
 
@@ -339,7 +347,9 @@ public void transactionOfferingGasPriceLessThanMinimumIsIdentifiedAndRemovedFrom
   @Test
   public void transactionTooLargeForBlockDoesNotPreventMoreBeingAddedIfBlockOccupancyNotReached() {
     final PendingTransactions pendingTransactions =
-        new PendingTransactions(5, TestClock.fixed(), metricsSystem);
+        new PendingTransactions(
+            TRANSACTION_EVICTION_INTERVAL_MS, 5, TestClock.fixed(), metricsSystem);
+
     final Blockchain blockchain = new TestBlockchain();
     final DefaultMutableWorldState worldState = inMemoryWorldState();
     final Supplier<Boolean> isCancelled = () -> false;
@@ -410,7 +420,9 @@ public void transactionTooLargeForBlockDoesNotPreventMoreBeingAddedIfBlockOccupa
   @Test
   public void transactionSelectionStopsWhenSufficientBlockOccupancyIsReached() {
     final PendingTransactions pendingTransactions =
-        new PendingTransactions(10, TestClock.fixed(), metricsSystem);
+        new PendingTransactions(
+            TRANSACTION_EVICTION_INTERVAL_MS, 5, TestClock.fixed(), metricsSystem);
+
     final Blockchain blockchain = new TestBlockchain();
     final DefaultMutableWorldState worldState = inMemoryWorldState();
     final Supplier<Boolean> isCancelled = () -> false;
@@ -492,7 +504,9 @@ public void transactionSelectionStopsWhenSufficientBlockOccupancyIsReached() {
   @Test
   public void shouldDiscardTransactionsThatFailValidation() {
     final PendingTransactions pendingTransactions =
-        new PendingTransactions(10, TestClock.fixed(), metricsSystem);
+        new PendingTransactions(
+            TRANSACTION_EVICTION_INTERVAL_MS, 5, TestClock.fixed(), metricsSystem);
+
     final TransactionProcessor transactionProcessor = mock(TransactionProcessor.class);
     final Blockchain blockchain = new TestBlockchain();
     final DefaultMutableWorldState worldState = inMemoryWorldState();

diff --git a/...n/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockCreatorTest.java b/...n/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockCreatorTest.java
@@ -30,6 +30,7 @@
 
 import java.io.IOException;
 import java.math.BigInteger;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
 import com.google.common.collect.Lists;
@@ -47,6 +48,7 @@ public class EthHashBlockCreatorTest {
 
   private static final BytesValue BLOCK_1_EXTRA_DATA =
       BytesValue.fromHexString("0x476574682f76312e302e302f6c696e75782f676f312e342e32");
+  private static final long TRANSACTION_EVICTION_INTERVAL_MS = TimeUnit.MINUTES.toMillis(1);
   private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
 
   private final ExecutionContextTestFixture executionContextTestFixture =
@@ -63,11 +65,16 @@ public class EthHashBlockCreatorTest {
   @Test
   public void createMainnetBlock1() throws IOException {
     final EthHashSolver solver = new EthHashSolver(Lists.newArrayList(BLOCK_1_NONCE), new Light());
+
+    final PendingTransactions pendingTransactions =
+        new PendingTransactions(
+            TRANSACTION_EVICTION_INTERVAL_MS, 1, TestClock.fixed(), metricsSystem);
+
     final EthHashBlockCreator blockCreator =
         new EthHashBlockCreator(
             BLOCK_1_COINBASE,
             parent -> BLOCK_1_EXTRA_DATA,
-            new PendingTransactions(1, TestClock.fixed(), metricsSystem),
+            pendingTransactions,
             executionContextTestFixture.getProtocolContext(),
             executionContextTestFixture.getProtocolSchedule(),
             gasLimit -> gasLimit,

diff --git a/.../src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutorTest.java b/.../src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutorTest.java
@@ -23,23 +23,29 @@
 import tech.pegasys.pantheon.util.Subscribers;
 
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
 
 public class EthHashMinerExecutorTest {
+  private static final long TRANSACTION_EVICTION_INTERVAL_MS = TimeUnit.MINUTES.toMillis(1);
   private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
 
   @Test
   public void startingMiningWithoutCoinbaseThrowsException() {
     final MiningParameters miningParameters =
         new MiningParametersTestBuilder().coinbase(null).build();
 
+    final PendingTransactions pendingTransactions =
+        new PendingTransactions(
+            TRANSACTION_EVICTION_INTERVAL_MS, 1, TestClock.fixed(), metricsSystem);
+
     final EthHashMinerExecutor executor =
         new EthHashMinerExecutor(
             null,
             Executors.newCachedThreadPool(),
             null,
-            new PendingTransactions(1, TestClock.fixed(), metricsSystem),
+            pendingTransactions,
             miningParameters,
             new DefaultBlockScheduler(1, 10, TestClock.fixed()));
 
@@ -52,12 +58,16 @@ public void startingMiningWithoutCoinbaseThrowsException() {
   public void settingCoinbaseToNullThrowsException() {
     final MiningParameters miningParameters = new MiningParametersTestBuilder().build();
 
+    final PendingTransactions pendingTransactions =
+        new PendingTransactions(
+            TRANSACTION_EVICTION_INTERVAL_MS, 1, TestClock.fixed(), metricsSystem);
+
     final EthHashMinerExecutor executor =
         new EthHashMinerExecutor(
             null,
             Executors.newCachedThreadPool(),
             null,
-            new PendingTransactions(1, TestClock.fixed(), metricsSystem),
+            pendingTransactions,
             miningParameters,
             new DefaultBlockScheduler(1, 10, TestClock.fixed()));