Unverified Commit d81c98b7 authored by Seun Lanlege's avatar Seun Lanlege Committed by GitHub
Browse files

Companion PR for #6846 (#1568)

* remove Arc<RpcHandlers>

* "Update Substrate"

Co-authored-by: parity-processbot <>
parent 8a50b23c
Pipeline #103997 passed with stages
in 25 minutes and 56 seconds
This diff is collapsed.
......@@ -72,7 +72,7 @@ pub fn polkadot_test_new_full(
Arc<polkadot_service::FullClient<polkadot_test_runtime::RuntimeApi, PolkadotTestExecutor>>,
FullNodeHandles,
Arc<NetworkService<Block, Hash>>,
Arc<RpcHandlers>,
RpcHandlers,
),
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.
pub addr: MultiaddrWithPeerId,
/// RPCHandlers to make RPC queries.
pub rpc_handlers: Arc<RpcHandlers>,
pub rpc_handlers: RpcHandlers,
}
impl<S, C> PolkadotTestNode<S, C>
......
......@@ -257,7 +257,7 @@ pub fn new_full<RuntimeApi, Executor>(
Arc<FullClient<RuntimeApi, Executor>>,
FullNodeHandles,
Arc<sc_network::NetworkService<Block, <Block as BlockT>::Hash>>,
Arc<RpcHandlers>,
RpcHandlers,
), Error>
where
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.
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
Runtime: 'static + Send + Sync + ConstructRuntimeApi<Block, LightClient<Runtime, Dispatch>>,
<Runtime as ConstructRuntimeApi<Block, LightClient<Runtime, Dispatch>>>::RuntimeApi:
......@@ -784,7 +784,7 @@ pub struct FullNodeHandles {
}
/// 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() {
new_light::<kusama_runtime::RuntimeApi, KusamaExecutor>(config)
} else if config.chain_spec.is_westend() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment