diff --git a/networks/suzuka/suzuka-full-node/src/main.rs b/networks/suzuka/suzuka-full-node/src/main.rs index 76e573678..707370a18 100644 --- a/networks/suzuka/suzuka-full-node/src/main.rs +++ b/networks/suzuka/suzuka-full-node/src/main.rs @@ -24,7 +24,7 @@ fn main() -> Result { tracing::error!("Suzuka node main task exit with an error : {err}",); } - // Terminate all runtime task. + // Terminate all running task. runtime.shutdown_background(); Ok(ExitCode::SUCCESS) } @@ -55,16 +55,13 @@ async fn start_suzuka() -> Result<(), anyhow::Error> { }); //Start suzuka node process - let (gb_jh, run_jh) = { - let dot_movement = dot_movement::DotMovement::try_from_env()?; - let config = dot_movement.try_get_config_from_json::()?; - let (executor, background_task) = SuzukaPartialNode::try_from_config(config) - .await - .context("Failed to create the executor")?; - let gb_jh = tokio::spawn(background_task); - let run_jh = tokio::spawn(async move { executor.run().await }); - (gb_jh, run_jh) - }; + let dot_movement = dot_movement::DotMovement::try_from_env()?; + let config = dot_movement.try_get_config_from_json::()?; + let (executor, background_task) = SuzukaPartialNode::try_from_config(config) + .await + .context("Failed to create the executor")?; + let gb_jh = tokio::spawn(background_task); + let run_jh = tokio::spawn(async move { executor.run().await }); // Wait for a task to end. select! { diff --git a/protocol-units/settlement/mcr/client/src/eth/mod.rs b/protocol-units/settlement/mcr/client/src/eth/mod.rs index d3d40003e..bdd7853eb 100644 --- a/protocol-units/settlement/mcr/client/src/eth/mod.rs +++ b/protocol-units/settlement/mcr/client/src/eth/mod.rs @@ -1,3 +1,2 @@ pub mod mcr; // pub mod staking; -pub mod utils; diff --git a/util/commander/src/lib.rs b/util/commander/src/lib.rs index 5a1c53202..2a29ba1bf 100644 --- a/util/commander/src/lib.rs +++ b/util/commander/src/lib.rs @@ -39,7 +39,7 @@ async fn pipe_error_output( pub async fn run_command(command: &str, args: &[&str]) -> Result { // print command out with args joined by space - println!("Running command: {} {}", command, args.join(" ")); + tracing::info!("Running command: {} {}", command, args.join(" ")); let mut child = Command::new(command) .args(args) @@ -82,7 +82,7 @@ pub async fn run_command(command: &str, args: &[&str]) -> Result { pub async fn spawn_command(command: String, args: Vec) -> Result<(Option, JoinHandle>)> { // print command out with args joined by space - println!("spawn command: {} {}", command, args.join(" ")); + tracing::info!("spawn command: {} {}", command, args.join(" ")); let mut child = Command::new(&command) .args(&args)