pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 01:11:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make run_node_until_exit take a future (#7318)

Browse Source 
The function takes a closure that resolved before to a `TaskManager`,
now it resolves to a `Future` which output is a `TaskManager`. This is
required for node setups that are async.
This commit is contained in:
Bastian Köcher
2020-10-14 10:03:37 +02:00
committed by GitHub
parent bcde7b4f3f
commit b427bbb363
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/bin/node-template/node/src/command.rs
+5 -3
View File
@@ -126,9 +126,11 @@ pub fn run() -> sc_cli::Result<()> {
},
None => {
let runner = cli.create_runner(&cli.run)?;
runner.run_node_until_exit(|config| match config.role {
Role::Light => service::new_light(config),
_ => service::new_full(config),
runner.run_node_until_exit(|config| async move {
match config.role {
Role::Light => service::new_light(config),
_ => service::new_full(config),
}
})
}
}
substrate/bin/node/cli/src/command.rs
+5 -3
View File
@@ -72,9 +72,11 @@ pub fn run() -> Result<()> {
match &cli.subcommand {
None => {
let runner = cli.create_runner(&cli.run)?;
runner.run_node_until_exit(|config| match config.role {
Role::Light => service::new_light(config),
_ => service::new_full(config),
runner.run_node_until_exit(|config| async move {
match config.role {
Role::Light => service::new_light(config),
_ => service::new_full(config),
}
})
}
Some(Subcommand::Inspect(cmd)) => {
substrate/client/cli/src/runner.rs
+5 -5
View File
@@ -172,24 +172,24 @@ impl<C: SubstrateCli> Runner<C> {
/// A helper function that runs a node with tokio and stops if the process receives the signal
/// `SIGTERM` or `SIGINT`.
pub fn run_node_until_exit(
pub fn run_node_until_exit<F: Future<Output = sc_service::error::Result<TaskManager>>>(
mut self,
initialise: impl FnOnce(Configuration) -> sc_service::error::Result<TaskManager>,
initialize: impl FnOnce(Configuration) -> F,
) -> Result<()> {
self.print_node_infos();
let mut task_manager = initialise(self.config)?;
let mut task_manager = self.tokio_runtime.block_on(initialize(self.config))?;
let res = self.tokio_runtime.block_on(main(task_manager.future().fuse()));
self.tokio_runtime.block_on(task_manager.clean_shutdown());
res.map_err(|e| e.to_string().into())
}
/// A helper function that runs a command with the configuration of this node
/// A helper function that runs a command with the configuration of this node.
pub fn sync_run(self, runner: impl FnOnce(Configuration) -> Result<()>) -> Result<()> {
runner(self.config)
}
/// A helper function that runs a future with tokio and stops if the process receives
/// the signal SIGTERM or SIGINT
/// the signal `SIGTERM` or `SIGINT`.
pub fn async_run<FUT>(
self, runner: impl FnOnce(Configuration) -> Result<(FUT, TaskManager)>,
) -> Result<()>