feat(helpers): renamed helper methods isMerge* -> isMergeTransition*

ethereum/core/src/testFixtures/java/tech/pegasys/teku/core/BlockProposalTestUtil.java

@@ -195,7 +195,7 @@ private ExecutionPayload createExecutionPayload(
     final ExecutionPayloadSchema schema =
         SchemaDefinitionsMerge.required(specVersion.getSchemaDefinitions())
             .getExecutionPayloadSchema();
-    if (terminalBlock.isEmpty() && !isMergeComplete(state)) {
+    if (terminalBlock.isEmpty() && !isMergeTransitionComplete(state)) {
       return schema.getDefault();
     }
 
@@ -223,8 +223,8 @@ private ExecutionPayload createExecutionPayload(
         transactions.orElse(Collections.emptyList()));
   }
 
-  private Boolean isMergeComplete(final BeaconState state) {
-    return spec.atSlot(state.getSlot()).miscHelpers().isMergeComplete(state);
+  private Boolean isMergeTransitionComplete(final BeaconState state) {
+    return spec.atSlot(state.getSlot()).miscHelpers().isMergeTransitionComplete(state);
   }
 
   public SignedBlockAndState createBlock(

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/helpers/MiscHelpers.java

@@ -241,7 +241,7 @@ private Bytes32 computeForkDataRoot(Bytes4 currentVersion, Bytes32 genesisValida
     return new ForkData(currentVersion, genesisValidatorsRoot).hashTreeRoot();
   }
 
-  public boolean isMergeComplete(final BeaconState state) {
+  public boolean isMergeTransitionComplete(final BeaconState state) {
     return false;
   }
 }

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/merge/block/BlockProcessorMerge.java

@@ -94,7 +94,7 @@ public void processExecutionPayload(
       final OptimisticExecutionPayloadExecutor payloadExecutor)
       throws BlockProcessingException {
     final MutableBeaconStateMerge state = MutableBeaconStateMerge.required(genericState);
-    if (miscHelpersMerge.isMergeComplete(state)) {
+    if (miscHelpersMerge.isMergeTransitionComplete(state)) {
       if (!payload.getParentHash().equals(state.getLatestExecutionPayloadHeader().getBlockHash())) {
         throw new BlockProcessingException(
             "Execution payload parent hash does not match previous execution payload header");

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/merge/helpers/MiscHelpersMerge.java

@@ -27,18 +27,18 @@ public MiscHelpersMerge(final SpecConfig specConfig) {
   }
 
   @Override
-  public boolean isMergeComplete(final BeaconState genericState) {
+  public boolean isMergeTransitionComplete(final BeaconState genericState) {
     final BeaconStateMerge state = BeaconStateMerge.required(genericState);
     return !state.getLatestExecutionPayloadHeader().isDefault();
   }
 
-  public boolean isMergeBlock(final BeaconState genericState, final BeaconBlock block) {
+  public boolean isMergeTransitionBlock(final BeaconState genericState, final BeaconBlock block) {
     final BeaconStateMerge state = BeaconStateMerge.required(genericState);
     final BeaconBlockBodyMerge blockBody = BeaconBlockBodyMerge.required(block.getBody());
-    return !isMergeComplete(state) && !blockBody.getExecutionPayload().isDefault();
+    return !isMergeTransitionComplete(state) && !blockBody.getExecutionPayload().isDefault();
   }
 
   public boolean isExecutionEnabled(final BeaconState genericState, final BeaconBlock block) {
-    return isMergeBlock(genericState, block) || isMergeComplete(genericState);
+    return isMergeTransitionBlock(genericState, block) || isMergeTransitionComplete(genericState);
   }
 }

ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/forkchoice/TerminalPowBlockMonitor.java

@@ -103,7 +103,7 @@ private synchronized void monitor() {
     // beaconState must be available at this stage
     BeaconState beaconState = recentChainData.getBestState().orElseThrow();
 
-    if (spec.atSlot(beaconState.getSlot()).miscHelpers().isMergeComplete(beaconState)) {
+    if (spec.atSlot(beaconState.getSlot()).miscHelpers().isMergeTransitionComplete(beaconState)) {
       LOG.info("MERGE is completed. Stopping.");
       stop();
       return;
@@ -134,7 +134,9 @@ private void initMergeState() {
       return;
     }
 
-    if (spec.atSlot(beaconState.get().getSlot()).miscHelpers().isMergeComplete(beaconState.get())) {
+    if (spec.atSlot(beaconState.get().getSlot())
+        .miscHelpers()
+        .isMergeTransitionComplete(beaconState.get())) {
       LOG.info("MERGE is completed. Stopping.");
       stop();
       return;

ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/validation/BlockValidator.java

@@ -116,7 +116,9 @@ public SafeFuture<InternalValidationResult> validate(SignedBeaconBlock block) {
                               "Block proposed by incorrect proposer (%s)",
                               block.getProposerIndex());
                         }
-                        if (spec.atSlot(block.getSlot()).miscHelpers().isMergeComplete(postState)) {
+                        if (spec.atSlot(block.getSlot())
+                            .miscHelpers()
+                            .isMergeTransitionComplete(postState)) {
                           Optional<ExecutionPayload> executionPayload =
                               block.getMessage().getBody().getOptionalExecutionPayload();