Use fixed calculator at the right spot.

PegaSysEng · Jan 26, 2019 · 5b53754 · 5b53754
1 parent 0d0b423
commit 5b53754
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/config/src/test-support/java/tech/pegasys/pantheon/config/StubGenesisConfigOptions.java b/config/src/test-support/java/tech/pegasys/pantheon/config/StubGenesisConfigOptions.java
@@ -61,6 +61,11 @@ public IbftConfigOptions getRevisedIbftConfigOptions() {
     return IbftConfigOptions.DEFAULT;
   }
 
+  @Override
+  public EthashConfigOptions getEthashConfigOptions() {
+    return EthashConfigOptions.DEFAULT;
+  }
+
   @Override
   public OptionalLong getHomesteadBlockNumber() {
     return homesteadBlockNumber;

diff --git a/...um/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolSchedule.java b/...um/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolSchedule.java
@@ -15,7 +15,8 @@
 import tech.pegasys.pantheon.config.GenesisConfigFile;
 import tech.pegasys.pantheon.config.GenesisConfigOptions;
 import tech.pegasys.pantheon.ethereum.core.PrivacyParameters;
-import tech.pegasys.pantheon.ethereum.development.DevelopmentDifficultyCalculators;
+
+import java.util.function.Function;
 
 /** Provides {@link ProtocolSpec} lookups for mainnet hard forks. */
 public class MainnetProtocolSchedule {
@@ -38,10 +39,7 @@ public static ProtocolSchedule<Void> create() {
   public static ProtocolSchedule<Void> fromConfig(
       final GenesisConfigOptions config, final PrivacyParameters privacyParameters) {
     return new ProtocolScheduleBuilder<>(
-            config,
-            DEFAULT_CHAIN_ID,
-            builder -> builder.difficultyCalculator(DevelopmentDifficultyCalculators.DEVELOPER),
-            privacyParameters)
+            config, DEFAULT_CHAIN_ID, Function.identity(), privacyParameters)
         .createProtocolSchedule();
   }
 }