Skip to content

Commit

Permalink
Requested changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ethanoroshiba committed Sep 30, 2024
1 parent 1940d37 commit 878e84f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion crates/astria-conductor/src/celestia/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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}`"
);
Expand Down
5 changes: 2 additions & 3 deletions crates/astria-conductor/src/sequencer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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}`"
);
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-conductor/tests/blackbox/firm_only.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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}"),
}
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-conductor/tests/blackbox/helpers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
};
Expand Down

0 comments on commit 878e84f

Please sign in to comment.