pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-20 19:45:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Companion PR for #7039: grandpa-rpc dont share subscription manager, only executor (#1687)

Browse Source 
* grandpa-rpc: dont share subscription manager, only executor

* node/rpc: merge imports

* node: apply style fixes from code review

* "Update Substrate"

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
Co-authored-by: parity-processbot <>
Co-authored-by: André Silva <andrerfosilva@gmail.com>
This commit is contained in:
Jon Häggblad
2020-09-14 13:30:52 +02:00
committed by GitHub
parent a95fd98c7d
commit 1cabde4932
5 changed files with 213 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/rpc/src/lib.rs
+4 -5
View File
@@ -29,8 +29,7 @@ use sp_consensus_babe::BabeApi;
use sc_client_api::light::{Fetcher, RemoteBlockchain};
use sc_consensus_babe::Epoch;
use sp_block_builder::BlockBuilder;
pub use sc_rpc::DenyUnsafe;
pub use jsonrpc_pubsub::manager::SubscriptionManager;
pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor};
/// A type representing all RPC extensions.
pub type RpcExtension = jsonrpc_core::IoHandler<sc_rpc::Metadata>;
@@ -66,7 +65,7 @@ pub struct GrandpaDeps {
/// Receives notifications about justification events from Grandpa.
pub justification_stream: sc_finality_grandpa::GrandpaJustificationStream<Block>,
/// Subscription manager to keep track of pubsub subscribers.
pub subscriptions: jsonrpc_pubsub::manager::SubscriptionManager,
pub subscription_executor: sc_rpc::SubscriptionTaskExecutor,
}
/// Full client dependencies
@@ -120,7 +119,7 @@ pub fn create_full<C, P, SC>(deps: FullDeps<C, P, SC>) -> RpcExtension where
shared_voter_state,
shared_authority_set,
justification_stream,
subscriptions,
subscription_executor,
} = grandpa;
io.extend_with(
@@ -146,7 +145,7 @@ pub fn create_full<C, P, SC>(deps: FullDeps<C, P, SC>) -> RpcExtension where
shared_authority_set,
shared_voter_state,
justification_stream,
subscriptions,
subscription_executor,
))
);
io