pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 01:41:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Companion PR for #6846 (#1568)

Browse Source 
* remove Arc<RpcHandlers>

* "Update Substrate"

Co-authored-by: parity-processbot <>
This commit is contained in:
Seun Lanlege
2020-08-15 10:31:51 +01:00
committed by GitHub
parent c5f7b4d17d
commit cf7133cbcf
3 changed files with 156 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+151 -143
View File
File diff suppressed because it is too large Load Diff
polkadot/node/test-service/src/lib.rs
+2 -2
View File
@@ -72,7 +72,7 @@ pub fn polkadot_test_new_full(
Arc<polkadot_service::FullClient<polkadot_test_runtime::RuntimeApi, PolkadotTestExecutor>>, Arc<polkadot_service::FullClient<polkadot_test_runtime::RuntimeApi, PolkadotTestExecutor>>,
FullNodeHandles, FullNodeHandles,
Arc<NetworkService<Block, Hash>>, Arc<NetworkService<Block, Hash>>,
Arc<RpcHandlers>, RpcHandlers,
), ),
ServiceError, ServiceError,
> { > {
@@ -237,7 +237,7 @@ pub struct PolkadotTestNode<S, C> {
/// The `MultiaddrWithPeerId` to this node. This is useful if you want to pass it as "boot node" to other nodes. /// The `MultiaddrWithPeerId` to this node. This is useful if you want to pass it as "boot node" to other nodes.
pub addr: MultiaddrWithPeerId, pub addr: MultiaddrWithPeerId,
/// RPCHandlers to make RPC queries. /// RPCHandlers to make RPC queries.
pub rpc_handlers: Arc<RpcHandlers>, pub rpc_handlers: RpcHandlers,
} }
impl<S, C> PolkadotTestNode<S, C> impl<S, C> PolkadotTestNode<S, C>
polkadot/service/src/lib.rs
+3 -3
View File
@@ -257,7 +257,7 @@ pub fn new_full<RuntimeApi, Executor>(
Arc<FullClient<RuntimeApi, Executor>>, Arc<FullClient<RuntimeApi, Executor>>,
FullNodeHandles, FullNodeHandles,
Arc<sc_network::NetworkService<Block, <Block as BlockT>::Hash>>, Arc<sc_network::NetworkService<Block, <Block as BlockT>::Hash>>,
Arc<RpcHandlers>, RpcHandlers,
), Error> ), Error>
where where
RuntimeApi: ConstructRuntimeApi<Block, FullClient<RuntimeApi, Executor>> + Send + Sync + 'static, RuntimeApi: ConstructRuntimeApi<Block, FullClient<RuntimeApi, Executor>> + Send + Sync + 'static,
@@ -560,7 +560,7 @@ pub fn new_full<RuntimeApi, Executor>(
} }
/// Builds a new service for a light client. /// Builds a new service for a light client.
fn new_light<Runtime, Dispatch>(mut config: Configuration) -> Result<(TaskManager, Arc<RpcHandlers>), Error> fn new_light<Runtime, Dispatch>(mut config: Configuration) -> Result<(TaskManager, RpcHandlers), Error>
where where
Runtime: 'static + Send + Sync + ConstructRuntimeApi<Block, LightClient<Runtime, Dispatch>>, Runtime: 'static + Send + Sync + ConstructRuntimeApi<Block, LightClient<Runtime, Dispatch>>,
<Runtime as ConstructRuntimeApi<Block, LightClient<Runtime, Dispatch>>>::RuntimeApi: <Runtime as ConstructRuntimeApi<Block, LightClient<Runtime, Dispatch>>>::RuntimeApi:
@@ -784,7 +784,7 @@ pub struct FullNodeHandles {
} }
/// Build a new light node. /// Build a new light node.
pub fn build_light(config: Configuration) -> Result<(TaskManager, Arc<RpcHandlers>), ServiceError> { pub fn build_light(config: Configuration) -> Result<(TaskManager, RpcHandlers), ServiceError> {
if config.chain_spec.is_kusama() { if config.chain_spec.is_kusama() {
new_light::<kusama_runtime::RuntimeApi, KusamaExecutor>(config) new_light::<kusama_runtime::RuntimeApi, KusamaExecutor>(config)
} else if config.chain_spec.is_westend() { } else if config.chain_spec.is_westend() {