getEarliestInvalidRoot -> getEarliestInvalidBlockRoot; `defaultEa…

…rliestInvalidRoot` -> `defaultEarliestInvalidBlockRoot`
status-im · Sep 26, 2022 · 840d097 · 840d097
1 parent 313a35d
commit 840d097
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/beacon_chain/consensus_object_pools/blockchain_dag.nim b/beacon_chain/consensus_object_pools/blockchain_dag.nim
@@ -1898,9 +1898,9 @@ proc updateHead*(
         dag.finalizedHead.blck.root, stateRoot, dag.finalizedHead.slot.epoch)
       dag.onFinHappened(dag, data)
 
-proc getEarliestInvalidRoot*(
+proc getEarliestInvalidBlockRoot*(
     dag: ChainDAGRef, initialSearchRoot: Eth2Digest,
-    latestValidHash: Eth2Digest, defaultEarliestInvalidRoot: Eth2Digest):
+    latestValidHash: Eth2Digest, defaultEarliestInvalidBlockRoot: Eth2Digest):
     Eth2Digest =
   # Earliest within a chain/fork in question, per LVH definition. Intended to
   # be called with `initialRoot` as the parent of the block regarding which a
@@ -1920,14 +1920,14 @@ proc getEarliestInvalidRoot*(
   # parent of the reported invalid block
   if  curBlck.executionBlockRoot.isSome and
       curBlck.executionBlockRoot.get == latestValidHash:
-    return defaultEarliestInvalidRoot
+    return defaultEarliestInvalidBlockRoot
 
   while true:
     # This was supposed to have been either caught by the pre-loop check or the
     # parent check.
     if  curBlck.executionBlockRoot.isSome and
         curBlck.executionBlockRoot.get == latestValidHash:
-      doAssert false, "getEarliestInvalidRoot: unexpected LVH in loop body"
+      doAssert false, "getEarliestInvalidBlockRoot: unexpected LVH in loop body"
 
     if (curBlck.parent.isNil) or
        curBlck.parent.executionBlockRoot.get(latestValidHash) ==

diff --git a/beacon_chain/consensus_object_pools/consensus_manager.nim b/beacon_chain/consensus_object_pools/consensus_manager.nim
@@ -241,7 +241,7 @@ proc updateExecutionClientHead(
     # This is a CL root, not EL hash
     let earliestKnownInvalidRoot =
       if latestValidHash.isSome:
-        self.dag.getEarliestInvalidRoot(
+        self.dag.getEarliestInvalidBlockRoot(
           newHead.blck.root, latestValidHash.get.asEth2Digest,
           newHead.blck.root)
       else:

diff --git a/tests/consensus_spec/test_fixture_fork_choice.nim b/tests/consensus_spec/test_fixture_fork_choice.nim
@@ -225,7 +225,7 @@ proc stepOnBlock(
       # future.
       let lvh = invalidatedRoots.getOrDefault(
         executionPayloadHash, static(default(Eth2Digest)))
-      fkChoice[].mark_root_invalid(dag.getEarliestInvalidRoot(
+      fkChoice[].mark_root_invalid(dag.getEarliestInvalidBlockRoot(
         signedBlock.message.parent_root, lvh, executionPayloadHash))
 
       return err BlockError.Invalid

diff --git a/tests/test_blockchain_dag.nim b/tests/test_blockchain_dag.nim
@@ -898,7 +898,7 @@ suite "Latest valid hash" & preset():
       # but returns CL block hash, because that's what fork choice and other
       # Nimbus components mostly use as a coordinate system. Since b1 is set
       # to be valid here by being the LVH, it means that b2 must be invalid.
-      dag.getEarliestInvalidRoot(
+      dag.getEarliestInvalidBlockRoot(
         b2Add[].root, b1.message.body.execution_payload.block_hash,
           fallbackEarliestInvalid) == b2Add[].root
 
@@ -908,6 +908,6 @@ suite "Latest valid hash" & preset():
       # a manually specified fallback (CL) block root to use, because it does
       # not have access to this information otherwise, because the very first
       # newest block in the chain it's examining is already valid.
-      dag.getEarliestInvalidRoot(
+      dag.getEarliestInvalidBlockRoot(
         b2Add[].root, b2.message.body.execution_payload.block_hash,
           fallbackEarliestInvalid) == fallbackEarliestInvalid