mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-01 05:27:56 +00:00
4009148889
* #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<[_]>
124 lines
3.2 KiB
Rust
124 lines
3.2 KiB
Rust
// This file is part of Substrate.
|
|
|
|
// Copyright (C) 2020-2022 Parity Technologies (UK) Ltd.
|
|
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
use futures::StreamExt;
|
|
use tokio_test::block_on;
|
|
|
|
use super::*;
|
|
|
|
mod normal_operation;
|
|
mod panicking_registry;
|
|
|
|
const TK: &str = "a_tracing_key";
|
|
|
|
type Message = u64;
|
|
type TestHub = Hub<Message, Registry>;
|
|
type TestReceiver = Receiver<Message, Registry>;
|
|
|
|
#[derive(Default)]
|
|
struct Registry {
|
|
subscribers: HashMap<SeqID, SubsKey>,
|
|
}
|
|
|
|
struct SubsKey {
|
|
_receiver: Option<TestReceiver>,
|
|
panic: SubsKeyPanic,
|
|
}
|
|
|
|
impl SubsKey {
|
|
fn new() -> Self {
|
|
Self { _receiver: None, panic: SubsKeyPanic::None }
|
|
}
|
|
fn with_receiver(self, receiver: TestReceiver) -> Self {
|
|
Self { _receiver: Some(receiver), ..self }
|
|
}
|
|
fn with_panic(self, panic: SubsKeyPanic) -> Self {
|
|
Self { panic, ..self }
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
enum SubsKeyPanic {
|
|
None,
|
|
|
|
OnSubscribePanicBefore,
|
|
OnSubscribePanicAfter,
|
|
|
|
OnUnsubscribePanicBefore,
|
|
OnUnsubscribePanicAfter,
|
|
|
|
OnDispatchPanicBefore,
|
|
OnDispatchPanicAfter,
|
|
}
|
|
|
|
impl<M> Hub<M, Registry> {
|
|
fn subs_count(&self) -> usize {
|
|
self.map_registry_for_tests(|r| r.subscribers.len())
|
|
}
|
|
fn sink_count(&self) -> usize {
|
|
self.shared.lock().borrow().sinks.len()
|
|
}
|
|
}
|
|
|
|
impl Subscribe<SubsKey> for Registry {
|
|
fn subscribe(&mut self, subs_key: SubsKey, subs_id: SeqID) {
|
|
let sk_panic = subs_key.panic;
|
|
|
|
if sk_panic == SubsKeyPanic::OnSubscribePanicBefore {
|
|
panic!("on-subscribe-panic-before")
|
|
}
|
|
self.subscribers.insert(subs_id, subs_key);
|
|
if sk_panic == SubsKeyPanic::OnSubscribePanicAfter {
|
|
panic!("on-subscribe-panic-after")
|
|
}
|
|
}
|
|
}
|
|
impl Unsubscribe for Registry {
|
|
fn unsubscribe(&mut self, subs_id: SeqID) {
|
|
let sk_panic =
|
|
self.subscribers.get(&subs_id).map(|sk| sk.panic).unwrap_or(SubsKeyPanic::None);
|
|
|
|
if sk_panic == SubsKeyPanic::OnUnsubscribePanicBefore {
|
|
panic!("on-unsubscribe-panic-before")
|
|
}
|
|
self.subscribers.remove(&subs_id);
|
|
if sk_panic == SubsKeyPanic::OnUnsubscribePanicAfter {
|
|
panic!("on-unsubscribe-panic-after")
|
|
}
|
|
}
|
|
}
|
|
impl Dispatch<Message> for Registry {
|
|
type Item = Message;
|
|
type Ret = ();
|
|
|
|
fn dispatch<F>(&mut self, message: Message, mut dispatch: F) -> Self::Ret
|
|
where
|
|
F: FnMut(&SeqID, Self::Item),
|
|
{
|
|
self.subscribers.iter().for_each(|(id, subs_key)| {
|
|
if subs_key.panic == SubsKeyPanic::OnDispatchPanicBefore {
|
|
panic!("on-dispatch-panic-before")
|
|
}
|
|
dispatch(id, message);
|
|
if subs_key.panic == SubsKeyPanic::OnDispatchPanicAfter {
|
|
panic!("on-dispatch-panic-after")
|
|
}
|
|
});
|
|
}
|
|
}
|