merge branch

Signed-off-by: edwardmack <ed@edwardmack.com>
hyperledger · Nov 5, 2019 · e5151c3 · e5151c3
1 parent 17ef801
commit e5151c3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...ore/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetDifficultyCalculators.java b/...ore/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetDifficultyCalculators.java
@@ -56,7 +56,7 @@ private MainnetDifficultyCalculators() {}
       };
 
   public static DifficultyCalculator<Void> HOMESTEAD =
-      (time, parent, protogit colContext) -> {
+      (time, parent, protocolContext) -> {
         final BigInteger parentDifficulty = difficulty(parent.getDifficulty());
         final BigInteger difficulty =
             ensureMinimumDifficulty(