diff --git a/crates/chain-state/src/chain_info.rs b/crates/chain-state/src/chain_info.rs index 142d19703..5a9725e25 100644 --- a/crates/chain-state/src/chain_info.rs +++ b/crates/chain-state/src/chain_info.rs @@ -123,12 +123,12 @@ impl ChainInfoTracker { } /// Subscribe to the finalized block. - pub fn subscribe_to_finalized_block(&self) -> watch::Receiver> { + pub fn subscribe_finalized_block(&self) -> watch::Receiver> { self.inner.finalized_block.subscribe() } /// Subscribe to the safe block. - pub fn subscribe_to_safe_block(&self) -> watch::Receiver> { + pub fn subscribe_safe_block(&self) -> watch::Receiver> { self.inner.safe_block.subscribe() } } diff --git a/crates/chain-state/src/in_memory.rs b/crates/chain-state/src/in_memory.rs index f110720ab..8be431e98 100644 --- a/crates/chain-state/src/in_memory.rs +++ b/crates/chain-state/src/in_memory.rs @@ -465,12 +465,12 @@ impl CanonicalInMemoryState { /// Subscribe to new safe block events. pub fn subscribe_safe_block(&self) -> watch::Receiver> { - self.inner.chain_info_tracker.subscribe_to_safe_block() + self.inner.chain_info_tracker.subscribe_safe_block() } /// Subscribe to new finalized block events. pub fn subscribe_finalized_block(&self) -> watch::Receiver> { - self.inner.chain_info_tracker.subscribe_to_finalized_block() + self.inner.chain_info_tracker.subscribe_finalized_block() } /// Attempts to send a new [`CanonStateNotification`] to all active Receiver handles. diff --git a/crates/chain-state/src/notifications.rs b/crates/chain-state/src/notifications.rs index a4ab993d8..f754bf613 100644 --- a/crates/chain-state/src/notifications.rs +++ b/crates/chain-state/src/notifications.rs @@ -146,14 +146,19 @@ pub struct ForkChoiceNotifications(pub watch::Receiver>); /// and get notified when a new fork choice is available. pub trait ForkChoiceSubscriptions: Send + Sync { /// Get notified when a new safe block of the chain is selected. - fn subscribe_to_safe_block(&self) -> ForkChoiceNotifications; + fn subscribe_safe_block(&self) -> ForkChoiceNotifications; /// Get notified when a new finalized block of the chain is selected. - fn subscribe_to_finalized_block(&self) -> ForkChoiceNotifications; + fn subscribe_finalized_block(&self) -> ForkChoiceNotifications; /// Convenience method to get a stream of the new safe blocks of the chain. - fn fork_choice_stream(&self) -> ForkChoiceStream { - ForkChoiceStream { st: WatchStream::new(self.subscribe_to_safe_block().0) } + fn safe_block_stream(&self) -> ForkChoiceStream { + ForkChoiceStream { st: WatchStream::new(self.subscribe_safe_block().0) } + } + + /// Convenience method to get a stream of the new finalized blocks of the chain. + fn finalized_block_stream(&self) -> ForkChoiceStream { + ForkChoiceStream { st: WatchStream::new(self.subscribe_finalized_block().0) } } } diff --git a/crates/storage/provider/src/providers/blockchain_provider.rs b/crates/storage/provider/src/providers/blockchain_provider.rs index d797c2456..98580622a 100644 --- a/crates/storage/provider/src/providers/blockchain_provider.rs +++ b/crates/storage/provider/src/providers/blockchain_provider.rs @@ -1435,12 +1435,12 @@ impl ForkChoiceSubscriptions for BlockchainProvider2 where DB: Send + Sync, { - fn subscribe_to_safe_block(&self) -> ForkChoiceNotifications { + fn subscribe_safe_block(&self) -> ForkChoiceNotifications { let receiver = self.canonical_in_memory_state.subscribe_safe_block(); ForkChoiceNotifications(receiver) } - fn subscribe_to_finalized_block(&self) -> ForkChoiceNotifications { + fn subscribe_finalized_block(&self) -> ForkChoiceNotifications { let receiver = self.canonical_in_memory_state.subscribe_finalized_block(); ForkChoiceNotifications(receiver) } diff --git a/crates/storage/provider/src/providers/mod.rs b/crates/storage/provider/src/providers/mod.rs index 35fdb3bc9..cd6fb7732 100644 --- a/crates/storage/provider/src/providers/mod.rs +++ b/crates/storage/provider/src/providers/mod.rs @@ -944,13 +944,13 @@ impl ForkChoiceSubscriptions for BlockchainProvider where DB: Send + Sync, { - fn subscribe_to_safe_block(&self) -> ForkChoiceNotifications { - let receiver = self.chain_info.subscribe_to_safe_block(); + fn subscribe_safe_block(&self) -> ForkChoiceNotifications { + let receiver = self.chain_info.subscribe_safe_block(); ForkChoiceNotifications(receiver) } - fn subscribe_to_finalized_block(&self) -> ForkChoiceNotifications { - let receiver = self.chain_info.subscribe_to_finalized_block(); + fn subscribe_finalized_block(&self) -> ForkChoiceNotifications { + let receiver = self.chain_info.subscribe_finalized_block(); ForkChoiceNotifications(receiver) } } diff --git a/crates/storage/provider/src/test_utils/noop.rs b/crates/storage/provider/src/test_utils/noop.rs index 8ff774447..814b7c121 100644 --- a/crates/storage/provider/src/test_utils/noop.rs +++ b/crates/storage/provider/src/test_utils/noop.rs @@ -557,12 +557,12 @@ impl CanonStateSubscriptions for NoopProvider { } impl ForkChoiceSubscriptions for NoopProvider { - fn subscribe_to_safe_block(&self) -> ForkChoiceNotifications { + fn subscribe_safe_block(&self) -> ForkChoiceNotifications { let (_, rx) = watch::channel(None); ForkChoiceNotifications(rx) } - fn subscribe_to_finalized_block(&self) -> ForkChoiceNotifications { + fn subscribe_finalized_block(&self) -> ForkChoiceNotifications { let (_, rx) = watch::channel(None); ForkChoiceNotifications(rx) }