xtask: require all binaries to be in the path

Author: gabriele-0201

xtask/src/main.rs

@@ -51,3 +51,13 @@ fn init_logging() -> anyhow::Result<()> {
         .try_init()?;
     Ok(())
 }
+
+fn check_binary(binary: &'static str, error_msg: &'static str) -> anyhow::Result<()> {
+    if let Err(_) = duct::cmd!("sh", "-c", format!("command -v {}", binary))
+        .stdout_null()
+        .run()
+    {
+        anyhow::bail!(error_msg);
+    }
+    Ok(())
+}

xtask/src/shim.rs

@@ -1,4 +1,4 @@
-use crate::{cli::test::ShimParams, logging::create_with_logs};
+use crate::{check_binary, cli::test::ShimParams, logging::create_with_logs};
 use duct::cmd;
 use tracing::info;
 
@@ -7,19 +7,25 @@ pub struct Shim(duct::Handle);
 impl Shim {
     // Try launching the shim, it requires an up an running ikura-node
     pub fn try_new(params: ShimParams) -> anyhow::Result<Self> {
+        check_binary(
+            "ikura-shim",
+            "'ikura-node' is not found in PATH.  \n \
+             cd to 'ikura/shim' and run 'cargo build --release' and add the result into your PATH.",
+        )?;
+
         tracing::info!("Shim logs redirected to {}", params.log_path);
         let with_logs = create_with_logs(params.log_path);
 
         // Wait for the shim to be connected, which indicates that the network is ready
         with_logs(
             "Wait for the network to be ready",
-            cmd!("ikura-shim", "query", "block", "--wait", "1",).dir("target/release/"),
+            cmd!("ikura-shim", "query", "block", "--wait", "1"),
         )
         .run()?;
 
         let shim_handle = with_logs(
             "Launching Shim",
-            cmd!("ikura-shim", "serve", "--submit-dev-alice").dir("target/release/"),
+            cmd!("ikura-shim", "serve", "--submit-dev-alice"),
         )
         .start()?;
 

xtask/src/sovereign.rs

@@ -1,4 +1,4 @@
-use crate::{cli::test::SovereignParams, logging::create_with_logs};
+use crate::{check_binary, cli::test::SovereignParams, logging::create_with_logs};
 use anyhow::bail;
 use duct::cmd;
 use tracing::info;
@@ -18,6 +18,12 @@ impl Sovereign {
             .stdout_null()
             .run()?;
 
+        check_binary(
+            "sov-demo-rollup",
+            "'sov-demo-rollup' is not found in PATH.  \n \
+             cd to 'demo/sovereign/demo-rollup' and run 'cargo build --release' and add the result into your PATH."
+        )?;
+
         info!("Sovereign logs redirected to {}", params.log_path);
         let with_logs = create_with_logs(params.log_path.clone());
 
@@ -27,7 +33,7 @@ impl Sovereign {
             "Launching sovereign rollup",
             cmd!(
                 "sh", "-c",
-                "cd demo/sovereign/demo-rollup && ./../target/release/sov-demo-rollup"
+                "cd demo/sovereign/demo-rollup && sov-demo-rollup"
             ),
         ).start()?;
 
@@ -39,16 +45,21 @@ impl Sovereign {
 
     // All the networks must be up (relaychain and ikura-node), including the sovereign rollup."
     pub fn test_sovereign_rollup(&self) -> anyhow::Result<()> {
+        check_binary(
+            "sov-cli",
+            "'sov-cli' is not found in PATH.  \n \
+             cd to 'demo/sovereign/demo-rollup' and run 'cargo build --release' and add the result into your PATH."
+        )?;
+
         info!("Running sovereign rollup test");
 
         //TODO: https://github.com/thrumdev/blobs/issues/227
-        let cli = "../target/release/sov-cli";
         let test_data_path = "../test-data/";
         let run_cli_cmd =
             |description: &str, args: &str| -> std::io::Result<std::process::Output> {
                 let args = [
                     "-c",
-                    &format!("cd demo/sovereign/demo-rollup/ && ./{} {}", cli, args),
+                    &format!("cd demo/sovereign/demo-rollup/ && sov-cli {}", args),
                 ];
 
                 (self.with_logs)(description, duct::cmd("sh", args)).run()

xtask/src/zombienet.rs

@@ -1,4 +1,4 @@
-use crate::{cli::test::ZombienetParams, logging::create_with_logs};
+use crate::{check_binary, cli::test::ZombienetParams, logging::create_with_logs};
 use duct::cmd;
 use tracing::info;
 
@@ -15,15 +15,6 @@ impl Zombienet {
         cmd!("rm", "-r", "zombienet").unchecked().run()?;
 
         info!("Checking binaries availability");
-        let check_binary = |binary: &'static str, error_msg: &'static str| -> anyhow::Result<()> {
-            if let Err(_) = cmd!("sh", "-c", format!("command -v {}", binary))
-                .stdout_null()
-                .run()
-            {
-                anyhow::bail!(error_msg);
-            }
-            Ok(())
-        };
 
         check_binary(
             "zombienet",