Merge branch 'bws-fix-restart' of github.com:fab-10/besu into bws-fix…

…-restart
hyperledger · Mar 10, 2023 · 6ec18f4 · 6ec18f4
2 parents b024562 + ee24951
commit 6ec18f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/...rc/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduleBasedBlockHeaderFunctions.java b/...rc/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduleBasedBlockHeaderFunctions.java
@@ -47,12 +47,6 @@ public ParsedExtraData parseExtraData(final BlockHeader header) {
   }
 
   private BlockHeaderFunctions getBlockHeaderFunctions(final SealableBlockHeader header) {
-    if (protocolSchedule instanceof ProtocolSchedule) {
-      return ((ProtocolSchedule) protocolSchedule)
-          .getByBlockNumber(header.getNumber())
-          .getBlockHeaderFunctions();
-    } else {
-      return protocolSchedule.getByBlockHeader(header).getBlockHeaderFunctions();
-    }
+    return protocolSchedule.getByBlockHeader(header).getBlockHeaderFunctions();
   }
 }
diff --git a/.../eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardChain.java b/.../eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardChain.java
@@ -152,7 +152,7 @@ private void updateFirstStoredAncestor(final Optional<BlockHeader> maybeHeader)
     firstStoredAncestor = maybeHeader;
   }
 
-  private void updateLastStorePivot(final Optional<BlockHeader> maybeHeader) {
+  private void updateLastStoredPivot(final Optional<BlockHeader> maybeHeader) {
     maybeHeader.ifPresentOrElse(
         header -> variablesStorage.put(LAST_STORED_PIVOT_KEY, header),
         () -> variablesStorage.drop(LAST_STORED_PIVOT_KEY));