feat : updated build process for madara and spawn process

madara-alliance · Dec 4, 2024 · 4698435 · 4698435
1 parent f8bb6d4
commit 4698435
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 39 deletions.
diff --git a/.github/workflows/test-bridge.yml b/.github/workflows/test-bridge.yml
@@ -77,6 +77,11 @@ jobs:
           ref: "d188aa91efa78bcc54f92aa1035295fd50e068d2"
           path: madara
 
+      - name: Build Madara
+        working-directory: madara
+        run: |
+          cargo build --release
+
       - name: Run anvil
         run: |
           anvil &

diff --git a/src/tests/mod.rs b/src/tests/mod.rs
@@ -26,45 +26,8 @@ async fn test_setup(args: &ConfigFile, clients: &Clients) -> BootstrapperOutput
     config.core_contract_address = Some(format!("{:?}", core_contract_address));
     config.core_contract_implementation_address = Some(format!("{:?}", core_contract_implementation_address));
 
-    env::set_current_dir("madara").expect("madara folder doesn't exist.");
-    fs::create_dir_all("../madara-dbs").expect("unable to create folders");
-    env::set_var("RUST_LOG", "info");
-
-    // Running madara
-    Command::new("cargo")
-        .arg("+1.81")
-        .arg("run")
-        .arg("--release")
-        .arg("--")
-        .arg("--name")
-        .arg("madara")
-        .arg("--base-path")
-        .arg("../madara-dbs/madara_pathfinder_test_11")
-        .arg("--rpc-port")
-        .arg("19944")
-        .arg("--rpc-cors")
-        .arg("*")
-        .arg("--rpc-external")
-        .arg("--sequencer")
-        .arg("--chain-config-path")
-        .arg("configs/presets/devnet.yaml")
-        .arg("--feeder-gateway-enable")
-        .arg("--gateway-enable")
-        .arg("--gateway-external")
-        .arg("--gas-price")
-        .arg("0")
-        .arg("--blob-gas-price")
-        .arg("0")
-        .arg("--rpc-methods")
-        .arg("unsafe")
-        .arg("--l1-endpoint")
-        .arg("http://localhost:8545")
-        .spawn()
-        .unwrap();
-
-    sleep(Duration::from_secs(5)).await;
-
-    env::set_current_dir("../").expect("Navigate back failed.");
+    ensure_toolchain().expect("Not able to ensure toolchain exists.");
+    wait_for_madara().await.expect("Failed to start madara!");
 
     // Setup L2 with the updated config
     let l2_output = setup_l2(&config, clients).await;
@@ -187,3 +150,55 @@ fn kill_process_on_port(port: u16) {
 fn get_test_config_file() -> ConfigFile {
     ConfigFile::default()
 }
+
+async fn wait_for_madara() -> color_eyre::Result<()> {
+    env::set_current_dir("madara").expect("madara folder doesn't exist.");
+    fs::create_dir_all("../madara-dbs").expect("unable to create folders");
+    env::set_var("RUST_LOG", "info");
+
+    Command::new("cargo")
+        .arg("+1.81")
+        .arg("run")
+        .arg("--release")
+        .arg("--")
+        .arg("--name")
+        .arg("madara")
+        .arg("--base-path")
+        .arg("../madara-dbs/madara_pathfinder_test_11")
+        .arg("--rpc-port")
+        .arg("19944")
+        .arg("--rpc-cors")
+        .arg("*")
+        .arg("--rpc-external")
+        .arg("--sequencer")
+        .arg("--chain-config-path")
+        .arg("configs/presets/devnet.yaml")
+        .arg("--feeder-gateway-enable")
+        .arg("--gateway-enable")
+        .arg("--gateway-external")
+        .arg("--gas-price")
+        .arg("0")
+        .arg("--blob-gas-price")
+        .arg("0")
+        .arg("--rpc-methods")
+        .arg("unsafe")
+        .arg("--l1-endpoint")
+        .arg("http://localhost:8545")
+        .spawn()?;
+
+    env::set_current_dir("../").expect("Navigate back failed.");
+
+    sleep(Duration::from_secs(10)).await;
+
+    Ok(())
+}
+
+fn ensure_toolchain() -> color_eyre::Result<()> {
+    let output = Command::new("rustup").arg("toolchain").arg("list").output()?;
+
+    let output_str = String::from_utf8_lossy(&output.stdout);
+    if !output_str.contains("1.81") {
+        Command::new("rustup").arg("install").arg("1.81").status()?;
+    }
+    Ok(())
+}