Clock.systemUTC only used once.

TestClock class added with a factory method for a fixed clock.
PegaSysEng · Mar 5, 2019 · 120a920 · 120a920
1 parent 553c1dd
commit 120a920
Show file tree

Hide file tree

Showing 25 changed files with 109 additions and 70 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
@@ -44,9 +44,9 @@
 import tech.pegasys.pantheon.ethereum.core.Wei;
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
 import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive;
+import tech.pegasys.pantheon.testutil.TestClock;
 import tech.pegasys.pantheon.util.bytes.BytesValue;
 
-import java.time.Clock;
 import java.util.List;
 
 import com.google.common.collect.Lists;
@@ -110,7 +110,7 @@ public void proposerAddressCanBeExtractFromAConstructedBlock() {
         new CliqueBlockCreator(
             coinbase,
             parent -> extraData.encode(),
-            new PendingTransactions(5, Clock.systemUTC()),
+            new PendingTransactions(5, TestClock.fixed()),
             protocolContext,
             protocolSchedule,
             gasLimit -> gasLimit,
@@ -137,7 +137,7 @@ public void insertsValidVoteIntoConstructedBlock() {
         new CliqueBlockCreator(
             coinbase,
             parent -> extraData.encode(),
-            new PendingTransactions(5, Clock.systemUTC()),
+            new PendingTransactions(5, TestClock.fixed()),
             protocolContext,
             protocolSchedule,
             gasLimit -> gasLimit,
@@ -163,7 +163,7 @@ public void insertsNoVoteWhenAuthInValidators() {
         new CliqueBlockCreator(
             coinbase,
             parent -> extraData.encode(),
-            new PendingTransactions(5, Clock.systemUTC()),
+            new PendingTransactions(5, TestClock.fixed()),
             protocolContext,
             protocolSchedule,
             gasLimit -> gasLimit,
@@ -192,7 +192,7 @@ public void insertsNoVoteWhenAtEpoch() {
         new CliqueBlockCreator(
             coinbase,
             parent -> extraData.encode(),
-            new PendingTransactions(5, Clock.systemUTC()),
+            new PendingTransactions(5, TestClock.fixed()),
             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
@@ -36,9 +36,9 @@
 import tech.pegasys.pantheon.ethereum.core.PendingTransactions;
 import tech.pegasys.pantheon.ethereum.core.Util;
 import tech.pegasys.pantheon.ethereum.core.Wei;
+import tech.pegasys.pantheon.testutil.TestClock;
 import tech.pegasys.pantheon.util.bytes.BytesValue;
 
-import java.time.Clock;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.Executors;
@@ -87,7 +87,7 @@ public void extraDataCreatedOnEpochBlocksContainsValidators() {
             cliqueProtocolContext,
             Executors.newSingleThreadExecutor(),
             CliqueProtocolSchedule.create(GENESIS_CONFIG_OPTIONS, proposerKeyPair),
-            new PendingTransactions(1, Clock.systemUTC()),
+            new PendingTransactions(1, TestClock.fixed()),
             proposerKeyPair,
             new MiningParameters(AddressHelpers.ofValue(1), Wei.ZERO, wrappedVanityData, false),
             mock(CliqueBlockScheduler.class),
@@ -117,7 +117,7 @@ public void extraDataForNonEpochBlocksDoesNotContainValidaors() {
             cliqueProtocolContext,
             Executors.newSingleThreadExecutor(),
             CliqueProtocolSchedule.create(GENESIS_CONFIG_OPTIONS, proposerKeyPair),
-            new PendingTransactions(1, Clock.systemUTC()),
+            new PendingTransactions(1, TestClock.fixed()),
             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
@@ -64,6 +64,7 @@
 import tech.pegasys.pantheon.ethereum.core.Wei;
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
 import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive;
+import tech.pegasys.pantheon.testutil.TestClock;
 import tech.pegasys.pantheon.util.Subscribers;
 import tech.pegasys.pantheon.util.bytes.BytesValue;
 import tech.pegasys.pantheon.util.uint.UInt256;
@@ -303,7 +304,7 @@ private static ControllerAndState createControllerAndFinalState(
                 ibftEventQueue,
                 BLOCK_TIMER_SEC * 1000,
                 Executors.newScheduledThreadPool(1),
-                Clock.systemUTC()),
+                TestClock.fixed()),
             blockCreatorFactory,
             new MessageFactory(nodeKeys),
             clock);

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
@@ -38,9 +38,9 @@
 import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator;
 import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode;
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
+import tech.pegasys.pantheon.testutil.TestClock;
 import tech.pegasys.pantheon.util.bytes.BytesValue;
 
-import java.time.Clock;
 import java.time.Instant;
 import java.util.Collections;
 import java.util.List;
@@ -92,7 +92,7 @@ public void createdBlockPassesValidationRulesAndHasAppropriateHashAndMixHash() {
                         0,
                         initialValidatorList)
                     .encode(),
-            new PendingTransactions(1, Clock.systemUTC()),
+            new PendingTransactions(1, TestClock.fixed()),
             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
@@ -38,9 +38,9 @@
 import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator;
 import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode;
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
+import tech.pegasys.pantheon.testutil.TestClock;
 import tech.pegasys.pantheon.util.bytes.BytesValue;
 
-import java.time.Clock;
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
@@ -97,7 +97,7 @@ public void headerProducedPassesValidationRules() {
                         null,
                         initialValidatorList)
                     .encode(),
-            new PendingTransactions(1, Clock.systemUTC()),
+            new PendingTransactions(1, TestClock.fixed()),
             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
@@ -47,10 +47,10 @@
 import tech.pegasys.pantheon.ethereum.vm.TestBlockchain;
 import tech.pegasys.pantheon.ethereum.worldstate.DefaultMutableWorldState;
 import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage;
+import tech.pegasys.pantheon.testutil.TestClock;
 import tech.pegasys.pantheon.util.bytes.BytesValue;
 import tech.pegasys.pantheon.util.uint.UInt256;
 
-import java.time.Clock;
 import java.time.Instant;
 import java.util.List;
 import java.util.function.Supplier;
@@ -71,7 +71,7 @@ public void emptyPendingTransactionsResultsInEmptyVettingResult() {
     final TransactionProcessor transactionProcessor =
         protocolSchedule.getByBlockNumber(0).getTransactionProcessor();
     final DefaultMutableWorldState worldState = inMemoryWorldState();
-    final PendingTransactions pendingTransactions = new PendingTransactions(5, Clock.systemUTC());
+    final PendingTransactions pendingTransactions = new PendingTransactions(5, TestClock.fixed());
     final Supplier<Boolean> isCancelled = () -> false;
 
     final ProcessableBlockHeader blockHeader =
@@ -108,7 +108,7 @@ public void emptyPendingTransactionsResultsInEmptyVettingResult() {
 
   @Test
   public void failedTransactionsAreIncludedInTheBlock() {
-    final PendingTransactions pendingTransactions = new PendingTransactions(5, Clock.systemUTC());
+    final PendingTransactions pendingTransactions = new PendingTransactions(5, TestClock.fixed());
 
     final Transaction transaction = createTransaction(1);
     pendingTransactions.addRemoteTransaction(transaction);
@@ -159,7 +159,7 @@ public void failedTransactionsAreIncludedInTheBlock() {
 
   @Test
   public void invalidTransactionsTransactionProcessingAreSkippedButBlockStillFills() {
-    final PendingTransactions pendingTransactions = new PendingTransactions(5, Clock.systemUTC());
+    final PendingTransactions pendingTransactions = new PendingTransactions(5, TestClock.fixed());
 
     final List<Transaction> transactionsToInject = Lists.newArrayList();
     for (int i = 0; i < 5; i++) {
@@ -221,7 +221,7 @@ public void invalidTransactionsTransactionProcessingAreSkippedButBlockStillFills
 
   @Test
   public void subsetOfPendingTransactionsIncludedWhenBlockGasLimitHit() {
-    final PendingTransactions pendingTransactions = new PendingTransactions(5, Clock.systemUTC());
+    final PendingTransactions pendingTransactions = new PendingTransactions(5, TestClock.fixed());
 
     final List<Transaction> transactionsToInject = Lists.newArrayList();
     // Transactions are reported in reverse order.
@@ -286,7 +286,7 @@ public void subsetOfPendingTransactionsIncludedWhenBlockGasLimitHit() {
 
   @Test
   public void transactionOfferingGasPriceLessThanMinimumIsIdentifiedAndRemovedFromPending() {
-    final PendingTransactions pendingTransactions = new PendingTransactions(5, Clock.systemUTC());
+    final PendingTransactions pendingTransactions = new PendingTransactions(5, TestClock.fixed());
 
     final Blockchain blockchain = new TestBlockchain();
 
@@ -330,7 +330,7 @@ public void transactionOfferingGasPriceLessThanMinimumIsIdentifiedAndRemovedFrom
 
   @Test
   public void transactionTooLargeForBlockDoesNotPreventMoreBeingAddedIfBlockOccupancyNotReached() {
-    final PendingTransactions pendingTransactions = new PendingTransactions(5, Clock.systemUTC());
+    final PendingTransactions pendingTransactions = new PendingTransactions(5, TestClock.fixed());
     final Blockchain blockchain = new TestBlockchain();
     final DefaultMutableWorldState worldState = inMemoryWorldState();
     final Supplier<Boolean> isCancelled = () -> false;
@@ -400,7 +400,7 @@ public void transactionTooLargeForBlockDoesNotPreventMoreBeingAddedIfBlockOccupa
 
   @Test
   public void transactionSelectionStopsWhenSufficientBlockOccupancyIsReached() {
-    final PendingTransactions pendingTransactions = new PendingTransactions(10, Clock.systemUTC());
+    final PendingTransactions pendingTransactions = new PendingTransactions(10, TestClock.fixed());
     final Blockchain blockchain = new TestBlockchain();
     final DefaultMutableWorldState worldState = inMemoryWorldState();
     final Supplier<Boolean> isCancelled = () -> false;
@@ -481,7 +481,7 @@ public void transactionSelectionStopsWhenSufficientBlockOccupancyIsReached() {
 
   @Test
   public void shouldDiscardTransactionsThatFailValidation() {
-    final PendingTransactions pendingTransactions = new PendingTransactions(10, Clock.systemUTC());
+    final PendingTransactions pendingTransactions = new PendingTransactions(10, TestClock.fixed());
     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
@@ -23,10 +23,10 @@
 import tech.pegasys.pantheon.ethereum.mainnet.EthHasher.Light;
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolScheduleBuilder;
 import tech.pegasys.pantheon.ethereum.mainnet.ValidationTestUtils;
+import tech.pegasys.pantheon.testutil.TestClock;
 import tech.pegasys.pantheon.util.bytes.BytesValue;
 
 import java.io.IOException;
-import java.time.Clock;
 import java.util.function.Function;
 
 import com.google.common.collect.Lists;
@@ -63,7 +63,7 @@ public void createMainnetBlock1() throws IOException {
         new EthHashBlockCreator(
             BLOCK_1_COINBASE,
             parent -> BLOCK_1_EXTRA_DATA,
-            new PendingTransactions(1, Clock.systemUTC()),
+            new PendingTransactions(1, TestClock.fixed()),
             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
@@ -17,9 +17,9 @@
 import tech.pegasys.pantheon.ethereum.core.MiningParameters;
 import tech.pegasys.pantheon.ethereum.core.MiningParametersTestBuilder;
 import tech.pegasys.pantheon.ethereum.core.PendingTransactions;
+import tech.pegasys.pantheon.testutil.TestClock;
 import tech.pegasys.pantheon.util.Subscribers;
 
-import java.time.Clock;
 import java.util.concurrent.Executors;
 
 import org.junit.Test;
@@ -36,9 +36,9 @@ public void startingMiningWithoutCoinbaseThrowsException() {
             null,
             Executors.newCachedThreadPool(),
             null,
-            new PendingTransactions(1, Clock.systemUTC()),
+            new PendingTransactions(1, TestClock.fixed()),
             miningParameters,
-            new DefaultBlockScheduler(1, 10, Clock.systemUTC()));
+            new DefaultBlockScheduler(1, 10, TestClock.fixed()));
 
     assertThatExceptionOfType(CoinbaseNotSetException.class)
         .isThrownBy(() -> executor.startAsyncMining(new Subscribers<>(), null))
@@ -54,9 +54,9 @@ public void settingCoinbaseToNullThrowsException() {
             null,
             Executors.newCachedThreadPool(),
             null,
-            new PendingTransactions(1, Clock.systemUTC()),
+            new PendingTransactions(1, TestClock.fixed()),
             miningParameters,
-            new DefaultBlockScheduler(1, 10, Clock.systemUTC()));
+            new DefaultBlockScheduler(1, 10, TestClock.fixed()));
 
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> executor.setCoinbase(null))

diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/PendingTransactionsTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/PendingTransactionsTest.java
@@ -19,8 +19,8 @@
 
 import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair;
 import tech.pegasys.pantheon.ethereum.core.PendingTransactions.TransactionSelectionResult;
+import tech.pegasys.pantheon.testutil.TestClock;
 
-import java.time.Clock;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.OptionalLong;
@@ -34,7 +34,7 @@ public class PendingTransactionsTest {
   private static final KeyPair KEYS1 = KeyPair.generate();
   private static final KeyPair KEYS2 = KeyPair.generate();
   private final PendingTransactions transactions =
-      new PendingTransactions(MAX_TRANSACTIONS, Clock.systemUTC());
+      new PendingTransactions(MAX_TRANSACTIONS, TestClock.fixed());
   private final Transaction transaction1 = createTransaction(2);
   private final Transaction transaction2 = createTransaction(1);
 

diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionPoolTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionPoolTest.java
@@ -41,9 +41,9 @@
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec;
 import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator;
 import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult;
+import tech.pegasys.pantheon.testutil.TestClock;
 import tech.pegasys.pantheon.util.uint.UInt256;
 
-import java.time.Clock;
 import java.util.List;
 import java.util.OptionalLong;
 
@@ -68,7 +68,7 @@ public class TransactionPoolTest {
   private final TransactionValidator transactionValidator = mock(TransactionValidator.class);
   private MutableBlockchain blockchain;
   private final PendingTransactions transactions =
-      new PendingTransactions(MAX_TRANSACTIONS, Clock.systemUTC());
+      new PendingTransactions(MAX_TRANSACTIONS, TestClock.fixed());
   private final Transaction transaction1 = createTransaction(1);
   private final Transaction transaction2 = createTransaction(2);
   private TransactionPool transactionPool;

diff --git a/.../eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTest.java b/.../eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTest.java
@@ -58,10 +58,10 @@
 import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage;
 import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive;
 import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem;
+import tech.pegasys.pantheon.testutil.TestClock;
 import tech.pegasys.pantheon.util.bytes.BytesValue;
 import tech.pegasys.pantheon.util.uint.UInt256;
 
-import java.time.Clock;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -1015,7 +1015,7 @@ public void transactionMessagesGoToTheCorrectExecutor() {
       // Create a transaction pool.  This has a side effect of registring a listener for the
       // transactions message.
       TransactionPoolFactory.createTransactionPool(
-          protocolSchedule, protocolContext, ethManager.ethContext(), Clock.systemUTC());
+          protocolSchedule, protocolContext, ethManager.ethContext(), TestClock.fixed());
 
       // Send just a transaction message.
       final PeerConnection peer = setupPeer(ethManager, (cap, msg, connection) -> {});

diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TestNode.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TestNode.java
@@ -46,12 +46,12 @@
 import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason;
 import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive;
 import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem;
+import tech.pegasys.pantheon.testutil.TestClock;
 import tech.pegasys.pantheon.util.bytes.BytesValue;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.net.InetAddress;
-import java.time.Clock;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -133,7 +133,7 @@ public TestNode(
     final EthContext ethContext = ethProtocolManager.ethContext();
     transactionPool =
         TransactionPoolFactory.createTransactionPool(
-            protocolSchedule, protocolContext, ethContext, Clock.systemUTC());
+            protocolSchedule, protocolContext, ethContext, TestClock.fixed());
     networkRunner.start();
 
     selfPeer = new DefaultPeer(id(), endpoint());

diff --git a/...va/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java b/...va/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java
@@ -43,10 +43,10 @@
 import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse;
 import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse;
 import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import tech.pegasys.pantheon.testutil.TestClock;
 import tech.pegasys.pantheon.util.bytes.BytesValue;
 import tech.pegasys.pantheon.util.uint.UInt256;
 
-import java.time.Clock;
 import java.util.List;
 
 import org.assertj.core.util.Lists;
@@ -65,7 +65,7 @@ public class EthGetFilterChangesIntegrationTest {
   private final String JSON_RPC_VERSION = "2.0";
   private TransactionPool transactionPool;
   private final PendingTransactions transactions =
-      new PendingTransactions(MAX_TRANSACTIONS, Clock.systemUTC());
+      new PendingTransactions(MAX_TRANSACTIONS, TestClock.fixed());
   private static final int MAX_TRANSACTIONS = 5;
   private static final KeyPair keyPair = KeyPair.generate();
   private final Transaction transaction = createTransaction(1);

diff --git a/...n/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionInfoResult.java b/...n/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionInfoResult.java
@@ -38,8 +38,8 @@ public String getHash() {
   }
 
   @JsonGetter(value = "addedToPoolAt")
-  public long getAddedToPoolAt() {
-    return addedToPoolAt.toEpochMilli();
+  public String getAddedToPoolAt() {
+    return addedToPoolAt.toString();
   }
 
   @JsonGetter(value = "isReceivedFromLocalSource")

diff --git a/...ech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/TxPoolPendingTransactionsTest.java b/...ech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/TxPoolPendingTransactionsTest.java
@@ -73,6 +73,6 @@ public void shouldReturnPendingTransactions() {
         result.getResults().stream().findFirst().get();
     assertEquals(TRANSACTION_HASH, actualTransactionInfo.getHash());
     assertEquals(true, actualTransactionInfo.isReceivedFromLocalSource());
-    assertEquals(addedAt.toEpochMilli(), actualTransactionInfo.getAddedToPoolAt());
+    assertEquals(addedAt.toString(), actualTransactionInfo.getAddedToPoolAt());
   }
 }