diff --git a/consensus/proto_array/src/proto_array.rs b/consensus/proto_array/src/proto_array.rs index 6931bdc34a..a669323afa 100644 --- a/consensus/proto_array/src/proto_array.rs +++ b/consensus/proto_array/src/proto_array.rs @@ -730,7 +730,7 @@ impl ProtoArray { /// Returns `true` if the proposer boost should be kept. Returns `false` if the /// boost should be subtracted (invalidated) because the parent is weak and there /// are no equivocating blocks at the parent's slot. - pub(crate) fn should_apply_proposer_boost( + fn should_apply_proposer_boost( &self, proposer_boost_root: Hash256, justified_balances: &JustifiedBalances, @@ -1129,7 +1129,7 @@ impl ProtoArray { /// /// Returns the set of node indices on viable branches — those with at least /// one leaf descendant with correct justified/finalized checkpoints. - pub(crate) fn get_filtered_block_tree( + fn get_filtered_block_tree( &self, start_index: usize, current_slot: Slot, @@ -1303,7 +1303,7 @@ impl ProtoArray { /// This is similar to `find_head_walk`, except it walks every viable branch instead of taking /// the maximum child at each step. #[allow(clippy::too_many_arguments)] - pub(crate) fn filtered_block_tree_leaves_and_weights( + pub fn filtered_block_tree_leaves_and_weights( &self, justified_root: &Hash256, current_slot: Slot, diff --git a/consensus/proto_array/src/proto_array_fork_choice.rs b/consensus/proto_array/src/proto_array_fork_choice.rs index c75a5d023f..9711f56b0b 100644 --- a/consensus/proto_array/src/proto_array_fork_choice.rs +++ b/consensus/proto_array/src/proto_array_fork_choice.rs @@ -1119,33 +1119,6 @@ impl ProtoArrayForkChoice { .map(|node| node.weight()) } - /// Returns the leaves of the filtered block tree (rooted at `justified_root`) along with - /// their weights — i.e. roots that are viable for head and have no descendant that is also - /// viable for head. Mirrors the spec's `viable_for_head_roots_and_weights` check. - #[allow(clippy::too_many_arguments)] - pub fn filtered_block_tree_leaves_and_weights( - &self, - justified_root: &Hash256, - current_slot: Slot, - justified_checkpoint: Checkpoint, - finalized_checkpoint: Checkpoint, - proposer_boost_root: Hash256, - justified_balances: &JustifiedBalances, - spec: &ChainSpec, - ) -> Result, String> { - self.proto_array - .filtered_block_tree_leaves_and_weights::( - justified_root, - current_slot, - justified_checkpoint, - finalized_checkpoint, - proposer_boost_root, - justified_balances, - spec, - ) - .map_err(|e| format!("filtered_block_tree_leaves_and_weights failed: {e:?}")) - } - /// Returns the payload status of the head node based on accumulated weights and tiebreaker. /// /// See `ProtoArray` documentation. diff --git a/testing/ef_tests/src/cases/fork_choice.rs b/testing/ef_tests/src/cases/fork_choice.rs index d44ae43298..fd65ae290a 100644 --- a/testing/ef_tests/src/cases/fork_choice.rs +++ b/testing/ef_tests/src/cases/fork_choice.rs @@ -1412,6 +1412,7 @@ impl Tester { let justified_balances = fork_choice.fc_store().justified_balances().clone(); let actual = fork_choice .proto_array() + .core_proto_array() .filtered_block_tree_leaves_and_weights::( &justified.root, current_slot, @@ -1423,7 +1424,7 @@ impl Tester { ) .map_err(|e| { Error::InternalError(format!( - "filtered_block_tree_leaves_and_weights failed: {e}" + "filtered_block_tree_leaves_and_weights failed: {e:?}" )) })?; drop(fork_choice);