Skip to content

Commit

Permalink
Expose internal functions used by spawn_tasks (paritytech#3166)
Browse files Browse the repository at this point in the history
This allows to build a custom version of `spawn_tasks` with less
copy-paste required.

Resolves paritytech#2110

---------

Co-authored-by: Bastian Köcher <git@kchr.de>
  • Loading branch information
nazar-pc and bkchr authored Feb 3, 2024
1 parent 2981d9f commit 2fab0cb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
11 changes: 7 additions & 4 deletions substrate/client/service/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ where
spawn_handle.spawn(
"on-transaction-imported",
Some("transaction-pool"),
transaction_notifications(
propagate_transaction_notifications(
transaction_pool.clone(),
tx_handler_controller,
telemetry.clone(),
Expand Down Expand Up @@ -532,7 +532,8 @@ where
Ok(rpc_handlers)
}

async fn transaction_notifications<Block, ExPool>(
/// Returns a future that forwards imported transactions to the transaction networking protocol.
pub async fn propagate_transaction_notifications<Block, ExPool>(
transaction_pool: Arc<ExPool>,
tx_handler_controller: sc_network_transactions::TransactionsHandlerController<
<Block as BlockT>::Hash,
Expand Down Expand Up @@ -560,7 +561,8 @@ async fn transaction_notifications<Block, ExPool>(
.await;
}

fn init_telemetry<Block, Client, Network>(
/// Initialize telemetry with provided configuration and return telemetry handle
pub fn init_telemetry<Block, Client, Network>(
config: &mut Configuration,
network: Network,
client: Arc<Client>,
Expand Down Expand Up @@ -598,7 +600,8 @@ where
Ok(telemetry.handle())
}

fn gen_rpc_module<TBl, TBackend, TCl, TRpc, TExPool>(
/// Generate RPC module using provided configuration
pub fn gen_rpc_module<TBl, TBackend, TCl, TRpc, TExPool>(
deny_unsafe: DenyUnsafe,
spawn_handle: SpawnTaskHandle,
client: Arc<TCl>,
Expand Down
2 changes: 1 addition & 1 deletion substrate/client/service/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ mod waiting {
}

/// Starts RPC servers.
fn start_rpc_servers<R>(
pub fn start_rpc_servers<R>(
config: &Configuration,
gen_rpc_module: R,
rpc_id_provider: Option<Box<dyn RpcSubscriptionIdProvider>>,
Expand Down

0 comments on commit 2fab0cb

Please sign in to comment.