Merge branch 'master' into post-state-validators

Author: courtneyeh

.circleci/config.yml

@@ -201,7 +201,7 @@ jobs:
             - deps-{{ checksum "build.gradle" }}-{{ checksum "gradle/versions.gradle" }}
       - run:
           name: Build
-          no_output_timeout: 60m
+          no_output_timeout: 20m
           command: |
             $Env:JAVA_TOOL_OPTIONS = "-Xmx2g"
             $Env:GRADLE_OPTS = "-Dorg.gradle.daemon=false -Dorg.gradle.parallel=true"
@@ -256,7 +256,7 @@ jobs:
           at: ~/project
       - run:
           name: UnitTests
-          no_output_timeout: 60m
+          no_output_timeout: 20m
           command: |
             CLASSNAMES=$(circleci tests glob "**/src/test/java/**/*.java" \
               | sed 's@.*/src/test/java/@@' \
@@ -543,6 +543,8 @@ workflows:
             tags:
               <<: *filters-release-tags
       - windowsBuild:
+          requires:
+            - spotless
           filters:
             tags:
               <<: *filters-release-tags

ethereum/networks/src/main/java/tech/pegasys/teku/networks/Eth2NetworkConfiguration.java

@@ -32,6 +32,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
@@ -266,6 +267,71 @@ public String toString() {
     return constants;
   }
 
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final Eth2NetworkConfiguration that = (Eth2NetworkConfiguration) o;
+    return startupTargetPeerCount == that.startupTargetPeerCount
+        && startupTimeoutSeconds == that.startupTimeoutSeconds
+        && asyncP2pMaxThreads == that.asyncP2pMaxThreads
+        && asyncBeaconChainMaxThreads == that.asyncBeaconChainMaxThreads
+        && asyncBeaconChainMaxQueue == that.asyncBeaconChainMaxQueue
+        && asyncP2pMaxQueue == that.asyncP2pMaxQueue
+        && forkChoiceLateBlockReorgEnabled == that.forkChoiceLateBlockReorgEnabled
+        && forkChoiceUpdatedAlwaysSendPayloadAttributes
+            == that.forkChoiceUpdatedAlwaysSendPayloadAttributes
+        && Objects.equals(spec, that.spec)
+        && Objects.equals(constants, that.constants)
+        && Objects.equals(stateBoostrapConfig, that.stateBoostrapConfig)
+        && Objects.equals(discoveryBootnodes, that.discoveryBootnodes)
+        && Objects.equals(altairForkEpoch, that.altairForkEpoch)
+        && Objects.equals(bellatrixForkEpoch, that.bellatrixForkEpoch)
+        && Objects.equals(capellaForkEpoch, that.capellaForkEpoch)
+        && Objects.equals(denebForkEpoch, that.denebForkEpoch)
+        && Objects.equals(eth1DepositContractAddress, that.eth1DepositContractAddress)
+        && Objects.equals(eth1DepositContractDeployBlock, that.eth1DepositContractDeployBlock)
+        && Objects.equals(trustedSetup, that.trustedSetup)
+        && Objects.equals(terminalBlockHashOverride, that.terminalBlockHashOverride)
+        && Objects.equals(totalTerminalDifficultyOverride, that.totalTerminalDifficultyOverride)
+        && Objects.equals(terminalBlockHashEpochOverride, that.terminalBlockHashEpochOverride)
+        && Objects.equals(eth2Network, that.eth2Network)
+        && Objects.equals(epochsStoreBlobs, that.epochsStoreBlobs);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        spec,
+        constants,
+        stateBoostrapConfig,
+        startupTargetPeerCount,
+        startupTimeoutSeconds,
+        discoveryBootnodes,
+        altairForkEpoch,
+        bellatrixForkEpoch,
+        capellaForkEpoch,
+        denebForkEpoch,
+        eth1DepositContractAddress,
+        eth1DepositContractDeployBlock,
+        trustedSetup,
+        terminalBlockHashOverride,
+        totalTerminalDifficultyOverride,
+        terminalBlockHashEpochOverride,
+        eth2Network,
+        epochsStoreBlobs,
+        asyncP2pMaxThreads,
+        asyncBeaconChainMaxThreads,
+        asyncBeaconChainMaxQueue,
+        asyncP2pMaxQueue,
+        forkChoiceLateBlockReorgEnabled,
+        forkChoiceUpdatedAlwaysSendPayloadAttributes);
+  }
+
   public static class Builder {
     private static final String EPOCHS_STORE_BLOBS_MAX_KEYWORD = "MAX";
     private String constants;

ethereum/networks/src/main/java/tech/pegasys/teku/networks/StateBoostrapConfig.java

@@ -13,6 +13,7 @@
 
 package tech.pegasys.teku.networks;
 
+import java.util.Objects;
 import java.util.Optional;
 
 public class StateBoostrapConfig {
@@ -58,4 +59,30 @@ public boolean isUsingCheckpointSync() {
   public boolean isAllowSyncOutsideWeakSubjectivityPeriod() {
     return allowSyncOutsideWeakSubjectivityPeriod;
   }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final StateBoostrapConfig that = (StateBoostrapConfig) o;
+    return isUsingCustomInitialState == that.isUsingCustomInitialState
+        && allowSyncOutsideWeakSubjectivityPeriod == that.allowSyncOutsideWeakSubjectivityPeriod
+        && Objects.equals(genesisState, that.genesisState)
+        && Objects.equals(initialState, that.initialState)
+        && Objects.equals(checkpointSyncUrl, that.checkpointSyncUrl);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        genesisState,
+        initialState,
+        checkpointSyncUrl,
+        isUsingCustomInitialState,
+        allowSyncOutsideWeakSubjectivityPeriod);
+  }
 }

ethereum/networks/src/test/java/tech/pegasys/teku/networks/Eth2NetworkConfigurationTest.java

@@ -42,7 +42,7 @@ public void build_shouldBuildKnownNetworks(
     networkDefinition.configure(networkConfigBuilder);
 
     assertThat(networkConfig.getConstants()).isEqualTo(network.configName());
-    assertThat(networkConfigBuilder.build()).usingRecursiveComparison().isEqualTo(networkConfig);
+    assertThat(networkConfigBuilder.build()).isEqualTo(networkConfig);
     assertThat(networkConfig.getNetworkBoostrapConfig().isUsingCustomInitialState()).isFalse();
   }
 
@@ -52,7 +52,7 @@ void shouldAliasGoerliToPrater() {
         Eth2NetworkConfiguration.builder("goerli").build();
     final Eth2NetworkConfiguration praterConfig =
         Eth2NetworkConfiguration.builder("prater").build();
-    assertThat(goerliConfig).usingRecursiveComparison().isEqualTo(praterConfig);
+    assertThat(goerliConfig).isEqualTo(praterConfig);
   }
 
   @Test
@@ -77,7 +77,7 @@ public void constants_usingConstantsUrl() {
 
   @Test
   public void applyNetworkDefaults_shouldOverwritePreviouslySetValues() {
-    List<Arguments> definedNetworks = getDefinedNetworks().collect(Collectors.toList());
+    List<Arguments> definedNetworks = getDefinedNetworks().toList();
 
     for (Arguments networkA : definedNetworks) {
       for (Arguments networkB : definedNetworks) {
@@ -88,16 +88,15 @@ public void applyNetworkDefaults_shouldOverwritePreviouslySetValues() {
         builder.applyNetworkDefaults(networkAName);
         builder.applyNetworkDefaults(networkBName);
 
-        assertThat(builder)
-            .usingRecursiveComparison()
-            .isEqualTo(Eth2NetworkConfiguration.builder(networkBName));
+        assertThat(builder.build())
+            .isEqualTo(Eth2NetworkConfiguration.builder(networkBName).build());
       }
     }
   }
 
   @Test
   public void applyNamedNetworkDefaults_shouldOverwritePreviouslySetValues() {
-    List<Arguments> definedNetworks = getDefinedNetworks().collect(Collectors.toList());
+    List<Arguments> definedNetworks = getDefinedNetworks().toList();
 
     for (Arguments networkA : definedNetworks) {
       for (Arguments networkB : definedNetworks) {
@@ -109,9 +108,8 @@ public void applyNamedNetworkDefaults_shouldOverwritePreviouslySetValues() {
         networkBDef.configure(builder);
 
         final Eth2Network networkBName = ((Eth2Network) networkB.get()[0]);
-        assertThat(builder)
-            .usingRecursiveComparison()
-            .isEqualTo(Eth2NetworkConfiguration.builder(networkBName));
+        assertThat(builder.build())
+            .isEqualTo(Eth2NetworkConfiguration.builder(networkBName).build());
       }
     }
   }

infrastructure/logging/src/main/java/tech/pegasys/teku/infrastructure/logging/LoggingConfig.java

@@ -15,6 +15,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
+import java.util.Objects;
 import java.util.Optional;
 import org.apache.logging.log4j.Level;
 
@@ -96,6 +97,40 @@ public int getDbOpAlertThresholdMillis() {
     return dbOpAlertThresholdMillis;
   }
 
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final LoggingConfig that = (LoggingConfig) o;
+    return colorEnabled == that.colorEnabled
+        && includeEventsEnabled == that.includeEventsEnabled
+        && includeValidatorDutiesEnabled == that.includeValidatorDutiesEnabled
+        && includeP2pWarningsEnabled == that.includeP2pWarningsEnabled
+        && dbOpAlertThresholdMillis == that.dbOpAlertThresholdMillis
+        && Objects.equals(logLevel, that.logLevel)
+        && destination == that.destination
+        && Objects.equals(logFile, that.logFile)
+        && Objects.equals(logFileNamePattern, that.logFileNamePattern);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        logLevel,
+        colorEnabled,
+        includeEventsEnabled,
+        includeValidatorDutiesEnabled,
+        includeP2pWarningsEnabled,
+        destination,
+        logFile,
+        logFileNamePattern,
+        dbOpAlertThresholdMillis);
+  }
+
   public static final class LoggingConfigBuilder {
     public static final String SEP = System.getProperty("file.separator");
 

services/beaconchain/src/test/java/tech/pegasys/teku/services/beaconchain/WeakSubjectivityInitializerTest.java

@@ -73,7 +73,7 @@ public void finalizeAndStoreConfig_nothingStored_noNewArgs() {
     assertThat(result).isCompleted();
     verify(queryChannel).getWeakSubjectivityState();
     verify(updateChannel, never()).onWeakSubjectivityUpdate(any());
-    assertThat(safeJoin(result)).usingRecursiveComparison().isEqualTo(defaultConfig);
+    assertThat(safeJoin(result)).isEqualTo(defaultConfig);
   }
 
   @Test
@@ -98,7 +98,7 @@ public void finalizeAndStoreConfig_nothingStored_withNewArgs() {
     verify(updateChannel)
         .onWeakSubjectivityUpdate(
             WeakSubjectivityUpdate.setWeakSubjectivityCheckpoint(cliCheckpoint));
-    assertThat(safeJoin(result)).usingRecursiveComparison().isEqualTo(cliConfig);
+    assertThat(safeJoin(result)).isEqualTo(cliConfig);
   }
 
   @Test
@@ -119,7 +119,6 @@ public void finalizeAndStoreConfig_withStoredCheckpoint_noNewArgs() {
     verify(queryChannel).getWeakSubjectivityState();
     verify(updateChannel, never()).onWeakSubjectivityUpdate(any());
     assertThat(safeJoin(result))
-        .usingRecursiveComparison()
         .isEqualTo(WeakSubjectivityConfig.builder(storedState).specProvider(spec).build());
   }
 
@@ -150,7 +149,7 @@ public void finalizeAndStoreConfig_withStoredCheckpoint_withNewDistinctArgs() {
     verify(updateChannel)
         .onWeakSubjectivityUpdate(
             WeakSubjectivityUpdate.setWeakSubjectivityCheckpoint(cliCheckpoint));
-    assertThat(safeJoin(result)).usingRecursiveComparison().isEqualTo(cliConfig);
+    assertThat(safeJoin(result)).isEqualTo(cliConfig);
   }
 
   @Test
@@ -175,7 +174,7 @@ public void finalizeAndStoreConfig_withStoredCheckpoint_withConsistentCLIArgs()
     assertThat(result).isCompleted();
     verify(queryChannel).getWeakSubjectivityState();
     verify(updateChannel, never()).onWeakSubjectivityUpdate(any());
-    assertThat(safeJoin(result)).usingRecursiveComparison().isEqualTo(cliConfig);
+    assertThat(safeJoin(result)).isEqualTo(cliConfig);
   }
 
   @Test

storage/src/test/java/tech/pegasys/teku/storage/store/AbstractStoreTest.java

@@ -53,7 +53,7 @@ public abstract class AbstractStoreTest {
   protected final ForkChoiceStrategy dummyForkChoiceStrategy = mock(ForkChoiceStrategy.class);
 
   protected void processChainWithLimitedCache(
-      BiConsumer<UpdatableStore, SignedBlockAndState> chainProcessor) {
+      final BiConsumer<UpdatableStore, SignedBlockAndState> chainProcessor) {
     final int cacheSize = 10;
     final int cacheMultiplier = 3;
 
@@ -84,7 +84,7 @@ protected void processChainWithLimitedCache(
   }
 
   protected void processCheckpointsWithLimitedCache(
-      BiConsumer<UpdatableStore, CheckpointState> chainProcessor) {
+      final BiConsumer<UpdatableStore, CheckpointState> chainProcessor) {
     final int cacheSize = 3;
     final int epochsToProcess = cacheSize * 3;
 
@@ -122,7 +122,7 @@ protected void processCheckpointsWithLimitedCache(
   }
 
   protected void processChainHeadWithMockForkChoiceStrategy(
-      BiConsumer<UpdatableStore, SignedBlockAndState> chainProcessor) {
+      final BiConsumer<UpdatableStore, SignedBlockAndState> chainProcessor) {
     final StoreConfig pruningOptions = StoreConfig.builder().build();
 
     final UpdatableStore store = createGenesisStoreWithMockForkChoiceStrategy(pruningOptions);
@@ -150,15 +150,54 @@ protected UpdatableStore createGenesisStore() {
     return createGenesisStore(defaultStoreConfig);
   }
 
+  protected UpdatableStore createGenesisStore(
+      final EarliestBlobSidecarSlotProvider earliestBlobSidecarSlotProvider) {
+    return createStoreBuilder(defaultStoreConfig, chainBuilder, earliestBlobSidecarSlotProvider)
+        .build();
+  }
+
+  protected UpdatableStore createGenesisStore(final StoreConfig pruningOptions) {
+    return createStoreBuilder(pruningOptions).build();
+  }
+
+  protected StoreBuilder createStoreBuilder(
+      final StoreConfig pruningOptions,
+      final ChainBuilder chainBuilder,
+      final EarliestBlobSidecarSlotProvider earliestBlobSidecarSlotProvider) {
+    final SignedBlockAndState genesis = chainBuilder.generateGenesis();
+    final Checkpoint genesisCheckpoint = chainBuilder.getCurrentCheckpointForEpoch(0);
+    return createStoreBuilder(
+        pruningOptions, genesis, genesisCheckpoint, earliestBlobSidecarSlotProvider);
+  }
+
   protected StoreBuilder createStoreBuilder(final StoreConfig pruningOptions) {
     final SignedBlockAndState genesis = chainBuilder.generateGenesis();
     final Checkpoint genesisCheckpoint = chainBuilder.getCurrentCheckpointForEpoch(0);
+    return createStoreBuilder(pruningOptions, genesis, genesisCheckpoint);
+  }
+
+  private StoreBuilder createStoreBuilder(
+      final StoreConfig pruningOptions,
+      final SignedBlockAndState genesis,
+      final Checkpoint genesisCheckpoint) {
+    return createStoreBuilder(
+        pruningOptions,
+        genesis,
+        genesisCheckpoint,
+        earliestBlobSidecarSlotProviderFromChainBuilder());
+  }
+
+  private StoreBuilder createStoreBuilder(
+      final StoreConfig pruningOptions,
+      final SignedBlockAndState genesis,
+      final Checkpoint genesisCheckpoint,
+      final EarliestBlobSidecarSlotProvider earliestBlobSidecarSlotProvider) {
     return StoreBuilder.create()
         .asyncRunner(SYNC_RUNNER)
         .metricsSystem(new StubMetricsSystem())
         .specProvider(spec)
         .blockProvider(blockProviderFromChainBuilder())
-        .earliestBlobSidecarSlotProvider(earliestBlobSidecarSlotProviderFromChainBuilder())
+        .earliestBlobSidecarSlotProvider(earliestBlobSidecarSlotProvider)
         .stateProvider(StateAndBlockSummaryProvider.NOOP)
         .anchor(Optional.empty())
         .genesisTime(genesis.getState().getGenesisTime())
@@ -181,10 +220,6 @@ protected StoreBuilder createStoreBuilder(final StoreConfig pruningOptions) {
         .votes(emptyMap());
   }
 
-  protected UpdatableStore createGenesisStore(final StoreConfig pruningOptions) {
-    return createStoreBuilder(pruningOptions).build();
-  }
-
   protected UpdatableStore createGenesisStoreWithMockForkChoiceStrategy(
       final StoreConfig pruningOptions) {
     return createStoreBuilder(pruningOptions).forkChoiceStrategy(dummyForkChoiceStrategy).build();