From cad38f84f6275a89a9a26400c8fbabc7af335645 Mon Sep 17 00:00:00 2001
From: Trevor Porter <trkporter@ucdavis.edu>
Date: Thu, 14 Dec 2023 12:14:07 +0000
Subject: [PATCH] reset run-locally changes

---
 rust/utils/run-locally/src/ethereum.rs | 20 +++++++++-----------
 rust/utils/run-locally/src/main.rs     |  9 ++++-----
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/rust/utils/run-locally/src/ethereum.rs b/rust/utils/run-locally/src/ethereum.rs
index dfa35298f4..5785260b32 100644
--- a/rust/utils/run-locally/src/ethereum.rs
+++ b/rust/utils/run-locally/src/ethereum.rs
@@ -21,18 +21,16 @@ pub fn start_anvil(config: Arc<Config>) -> AgentHandles {
     }
     yarn_monorepo.clone().cmd("build").run().join();
 
-    // if !config.is_ci_env {
-    //     // Kill any existing anvil processes just in case since it seems to have issues getting cleaned up
-    //     Program::new("pkill")
-    //         .raw_arg("-SIGKILL")
-    //         .cmd("anvil")
-    //         .run_ignore_code()
-    //         .join();
-    // }
+    if !config.is_ci_env {
+        // Kill any existing anvil processes just in case since it seems to have issues getting cleaned up
+        Program::new("pkill")
+            .raw_arg("-SIGKILL")
+            .cmd("anvil")
+            .run_ignore_code()
+            .join();
+    }
     log!("Launching anvil...");
-    let anvil_args = Program::new("sleep")
-        .raw_arg("1000000")
-        .filter_logs(|_| false); // for now do not keep any of the anvil logs
+    let anvil_args = Program::new("anvil").flag("silent").filter_logs(|_| false); // for now do not keep any of the anvil logs
     let anvil = anvil_args.spawn("ETH");
 
     sleep(Duration::from_secs(10));
diff --git a/rust/utils/run-locally/src/main.rs b/rust/utils/run-locally/src/main.rs
index 5434ede050..52d56ed5d4 100644
--- a/rust/utils/run-locally/src/main.rs
+++ b/rust/utils/run-locally/src/main.rs
@@ -336,7 +336,7 @@ fn main() -> ExitCode {
         .cmd("kathy")
         .arg("messages", (config.kathy_messages / 4).to_string())
         .arg("timeout", "1000");
-    kathy_env_single_insertion.clone().run();
+    kathy_env_single_insertion.clone().run().join();
 
     let kathy_env_zero_insertion = Program::new("yarn")
         .working_dir(INFRA_PATH)
@@ -349,7 +349,7 @@ fn main() -> ExitCode {
         // replacing the `aggregationHook` with the `interchainGasPaymaster` means there
         // is no more `merkleTreeHook`, causing zero merkle insertions to occur.
         .arg("default-hook", "interchainGasPaymaster");
-    kathy_env_zero_insertion.clone().run();
+    kathy_env_zero_insertion.clone().run().join();
 
     let kathy_env_double_insertion = Program::new("yarn")
         .working_dir(INFRA_PATH)
@@ -359,7 +359,7 @@ fn main() -> ExitCode {
         // replacing the `protocolFees` required hook with the `merkleTreeHook`
         // will cause double insertions to occur, which should be handled correctly
         .arg("required-hook", "merkleTreeHook");
-    kathy_env_double_insertion.clone().run();
+    kathy_env_double_insertion.clone().run().join();
 
     // Send some sealevel messages before spinning up the agents, to test the backward indexing cursor
     // for _i in 0..(SOL_MESSAGES_EXPECTED / 2) {
@@ -372,8 +372,7 @@ fn main() -> ExitCode {
         state.push_agent(validator);
     }
 
-    // state.push_agent(relayer_env.spawn("RLY"));
-    println!("Relayer command: {:?}", relayer_env.create_command());
+    state.push_agent(relayer_env.spawn("RLY"));
 
     // Send some sealevel messages after spinning up the relayer, to test the forward indexing cursor
     // for _i in 0..(SOL_MESSAGES_EXPECTED / 2) {