From 878e84fa8d63ca15ed0b3718354830ea57b95b74 Mon Sep 17 00:00:00 2001
From: ethanoroshiba <ethan@astria.org>
Date: Mon, 30 Sep 2024 10:44:53 -0500
Subject: [PATCH] Requested changes

---
 crates/astria-conductor/src/celestia/mod.rs           | 2 +-
 crates/astria-conductor/src/sequencer/mod.rs          | 5 ++---
 crates/astria-conductor/tests/blackbox/firm_only.rs   | 2 +-
 crates/astria-conductor/tests/blackbox/helpers/mod.rs | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/crates/astria-conductor/src/celestia/mod.rs b/crates/astria-conductor/src/celestia/mod.rs
index d5c532263..8dc690463 100644
--- a/crates/astria-conductor/src/celestia/mod.rs
+++ b/crates/astria-conductor/src/celestia/mod.rs
@@ -184,7 +184,7 @@ impl Reader {
                 .wrap_err("failed to fetch Celestia chain ID")?;
             let expected_celestia_chain_id = &self.expected_celestia_chain_id;
             ensure!(
-                self.expected_celestia_chain_id == actual_celestia_chain_id.to_string(),
+                self.expected_celestia_chain_id == actual_celestia_chain_id.as_str(),
                 "expected Celestia chain id `{expected_celestia_chain_id}` does not match actual: \
                  `{actual_celestia_chain_id}`"
             );
diff --git a/crates/astria-conductor/src/sequencer/mod.rs b/crates/astria-conductor/src/sequencer/mod.rs
index 457a2e3c6..524fbc00d 100644
--- a/crates/astria-conductor/src/sequencer/mod.rs
+++ b/crates/astria-conductor/src/sequencer/mod.rs
@@ -106,11 +106,10 @@ impl Reader {
         let actual_sequencer_chain_id =
             get_sequencer_chain_id(self.sequencer_cometbft_client.clone())
                 .await
-                .wrap_err("failed to get chain ID from Sequencer")?
-                .to_string();
+                .wrap_err("failed to get chain ID from Sequencer")?;
         let expected_sequencer_chain_id = &self.expected_sequencer_chain_id;
         ensure!(
-            self.expected_sequencer_chain_id == actual_sequencer_chain_id,
+            self.expected_sequencer_chain_id == actual_sequencer_chain_id.as_str(),
             "expected chain id `{expected_sequencer_chain_id}` does not match actual: \
              `{actual_sequencer_chain_id}`"
         );
diff --git a/crates/astria-conductor/tests/blackbox/firm_only.rs b/crates/astria-conductor/tests/blackbox/firm_only.rs
index 863ddf3cc..e7e0c0ee0 100644
--- a/crates/astria-conductor/tests/blackbox/firm_only.rs
+++ b/crates/astria-conductor/tests/blackbox/firm_only.rs
@@ -508,7 +508,7 @@ async fn exits_on_celestia_chain_id_mismatch() {
                 }
                 source = err.source();
             }
-            panic!("conductor exited with incorrect error: {e}")
+            panic!("conductor exited with incorrect error: {e:?}")
         }
         Err(e) => panic!("conductor handle resulted in an error: {e}"),
     }
diff --git a/crates/astria-conductor/tests/blackbox/helpers/mod.rs b/crates/astria-conductor/tests/blackbox/helpers/mod.rs
index 68f33aa0e..64c6d2f45 100644
--- a/crates/astria-conductor/tests/blackbox/helpers/mod.rs
+++ b/crates/astria-conductor/tests/blackbox/helpers/mod.rs
@@ -136,7 +136,7 @@ impl Drop for TestConductor {
                 {
                     Ok(Ok(_)) => None,
                     Ok(Err(conductor_err)) => Some(format!(
-                        "conductor failed during shutdown:\n{conductor_err:?}"
+                        "conductor shut down with an error:\n{conductor_err:?}"
                     )),
                     Err(_timeout) => Some("timed out waiting for conductor to shut down".into()),
                 };