Use new method

paulhauner · paulhauner · commit bff90287f0c5 · 2023-01-27T16:20:23.000+01:00
diff --git a/consensus/fork_choice/src/fork_choice.rs b/consensus/fork_choice/src/fork_choice.rs
@@ -1374,8 +1374,7 @@ where
 
     /// Return `true` if `block_root` is equal to the finalized root, or a known descendant of it.
     pub fn is_descendant_of_finalized(&self, block_root: Hash256) -> bool {
-        self.proto_array
-            .is_descendant(self.fc_store.finalized_checkpoint().root, block_root)
+        self.proto_array.is_finalized_descendant::<E>(block_root)
     }
 
     /// Returns `Ok(true)` if `block_root` has been imported optimistically or deemed invalid.
diff --git a/consensus/proto_array/src/proto_array.rs b/consensus/proto_array/src/proto_array.rs
@@ -482,6 +482,7 @@ impl ProtoArray {
         let latest_valid_ancestor_is_descendant =
             latest_valid_ancestor_root.map_or(false, |ancestor_root| {
                 self.is_descendant(ancestor_root, head_block_root)
+                    // TODO(paul): should this be updated to the new method?
                     && self.is_descendant(self.finalized_checkpoint.root, ancestor_root)
             });
 
diff --git a/consensus/proto_array/src/proto_array_fork_choice.rs b/consensus/proto_array/src/proto_array_fork_choice.rs
@@ -748,6 +748,12 @@ impl ProtoArrayForkChoice {
             .is_descendant(ancestor_root, descendant_root)
     }
 
+    /// See `ProtoArray` documentation.
+    pub fn is_finalized_descendant<E: EthSpec>(&self, descendant_root: Hash256) -> bool {
+        self.proto_array
+            .is_finalized_descendant::<E>(descendant_root)
+    }
+
     pub fn latest_message(&self, validator_index: usize) -> Option<(Hash256, Epoch)> {
         if validator_index < self.votes.0.len() {
             let vote = &self.votes.0[validator_index];
@@ -993,6 +999,11 @@ mod test_compute_deltas {
         assert!(!fc.is_descendant(finalized_root, not_finalized_desc));
         assert!(!fc.is_descendant(finalized_root, unknown));
 
+        assert!(fc.is_finalized_descendant::<MainnetEthSpec>(finalized_root));
+        assert!(fc.is_finalized_descendant::<MainnetEthSpec>(finalized_desc));
+        assert!(!fc.is_finalized_descendant::<MainnetEthSpec>(not_finalized_desc));
+        assert!(!fc.is_finalized_descendant::<MainnetEthSpec>(unknown));
+
         assert!(!fc.is_descendant(finalized_desc, not_finalized_desc));
         assert!(fc.is_descendant(finalized_desc, finalized_desc));
         assert!(!fc.is_descendant(finalized_desc, finalized_root));

Original file line number	Diff line number	Diff line change
`@@ -1374,8 +1374,7 @@ where`
`1374`	`1374`
`1375`	`1375`	/// Return `true` if `block_root` is equal to the finalized root, or a known descendant of it.
`1376`	`1376`	`pub fn is_descendant_of_finalized(&self, block_root: Hash256) -> bool {`
`1377`		`- self.proto_array`
`1378`		`- .is_descendant(self.fc_store.finalized_checkpoint().root, block_root)`
	`1377`	`+ self.proto_array.is_finalized_descendant::<E>(block_root)`
`1379`	`1378`	`}`
`1380`	`1379`
`1381`	`1380`	/// Returns `Ok(true)` if `block_root` has been imported optimistically or deemed invalid.