Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit 79d0475

Browse files
#10576: generic utility to unsubscribe from broadcast upon drop of the rx-side. (#10708)
* #10576: refactor `sc-utils::notification` and `sc-client-api::notifications`, so that they use common subscribe/unsubscribe routines * Add some docs. Reorganise `sc-utils::notification` * `sc-clent-api::notifications` and `sc-utils::notification` — ensure the SubscriptionGuard is dropped before the Rx-channel * `sc-utils::pubsub::SubscriptionGuard` make it a bit more ergonomic. Let the `Rx` to be put inside of the `SubscriptionGuard`, so that the latter shall guarantee the order: - first unsubscribe; - then drop the `Rx`. * Being less zealous with splitting the modules into little pieces * rework pubsub: the concrete usage should only define a good registry type * sc-client-api::notifications: make it comply with the reworked pubsub * cargo fmt * make sc-client-api tests work * Address the review notes * cargo fmt * Describe the behaviour of pubsub registry * Doc-comments for module `sc-utils::pubsub` * Fix: it used to send notifications regardless of the filter setup during subscription * `sc-client-api::StorageNotifications` the API does not have to require mut-self-reference. As a result `sc-service::Client` does not have to wrap its `storage_notifications` into a Mutex. * cargo fmt * Several changes addressing the notes by @bckhr. - Remove the `impl Default for StorageNotifications<Block>`; - no need for groupping the `remove_from` and `listen_from` into a separate `helpers` module; - remove unnecessary import `use registry::SubscribeOp`. * Add a doc-comment to the `sc-client::notifications::SubscribeOp` * As per @bkchr note on the unproven assertion: behave gracefully upon receiving a duplicate subscription-ID. * sc-utils::pubsub: log when a registry yields an ID that does point to an existing sink * `sc-utils::notifications`: payload materialized lazily * Update Cargo.lock (after adding `log` as a dependency to the `sc-utils`) * `sc-client-api::notifications`: introduce a struct (instead of a type def) for the notification message * Get rid of `sc-utils::pubsub::Channel` trait (instead just use the `sc-utils::mpsc`) * The SubsID is no more generic: the fact it is a `Copy` is known — no need to pass it by ref * sc-utils::pubsub internals do not have to be generic over the channel type * Rename Hub::dispatch into Hub::send * That method was unnecessary (`SubscriberSink::render_notification`) * cargo fmt * No need for a separate UnsubscribeGuard type * Ditch the type-def of SubsID in the sc-utils::pubsub, instead — just use the crate::id_sequence::SeqID * Return the <Registry as Dispatch>::Ret when sending an item * Make the `Hub<M, R>::lock_registry(...)` method more ergonomic * cargo doc links * cargo doc links * Use a simpler name for the type * cargo doc links * Derive `Default` rather than implement it * Derive `Default` rather than implement it * Remove an unnecessary usage of type_name * Define a more cautious order between sinks.remove->registry.unsubscribe and registry.subscribe->sinks.insert * Hub: lock_registry_for_tests->map_registry_for_tests — a safer choice for a public API * Replace Mutex over the shared Registry with a ReentrableMutex+RefCell * sc-utils::pubsub: add tests for a panicking registry * Add the missing copyright headers * Arc<Vec<_>> -> Arc<[_]>
1 parent e073c24 commit 79d0475

File tree

19 files changed

+1604
-672
lines changed

19 files changed

+1604
-672
lines changed

Cargo.lock

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/api/src/client.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,9 @@ pub struct FinalityNotification<Block: BlockT> {
307307
/// Finalized block header.
308308
pub header: Block::Header,
309309
/// Path from the old finalized to new finalized parent (implicitly finalized blocks).
310-
pub tree_route: Arc<Vec<Block::Hash>>,
310+
pub tree_route: Arc<[Block::Hash]>,
311311
/// Stale branches heads.
312-
pub stale_heads: Arc<Vec<Block::Hash>>,
312+
pub stale_heads: Arc<[Block::Hash]>,
313313
}
314314

315315
impl<B: BlockT> TryFrom<BlockImportNotification<B>> for ChainEvent<B> {
@@ -336,8 +336,8 @@ impl<B: BlockT> From<FinalizeSummary<B>> for FinalityNotification<B> {
336336
FinalityNotification {
337337
hash,
338338
header: summary.header,
339-
tree_route: Arc::new(summary.finalized),
340-
stale_heads: Arc::new(summary.stale_heads),
339+
tree_route: Arc::from(summary.finalized),
340+
stale_heads: Arc::from(summary.stale_heads),
341341
}
342342
}
343343
}

0 commit comments

Comments
 (0)