Skip to content

Commit

Permalink
chore(conductor): don't return empty tuple (#1885)
Browse files Browse the repository at this point in the history
## Summary
Removed empty tuple member in return type.

## Background
We shouldn't be returning a tuple with an empty member.

## Changes
- Removed empty member from tuple return.

## Testing
Passing all tests.

## Changelogs
No updates required.

## Breaking Changes
Noting that this requires overriding the Conductor code freeze, but due
to the very small nature of this change I believe this will be okay
since it should not have any bearing on auditing of the service.

## Related Issues
closes #1879
  • Loading branch information
ethanoroshiba authored Jan 6, 2025
1 parent 2d27d57 commit 7a0e4d0
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions crates/astria-conductor/src/celestia/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ pub(crate) struct Reader {

impl Reader {
pub(crate) async fn run_until_stopped(mut self) -> eyre::Result<()> {
let ((), executor, sequencer_chain_id) = select!(
let (executor, sequencer_chain_id) = select!(
() = self.shutdown.clone().cancelled_owned() => {
info_span!("conductor::celestia::Reader::run_until_stopped").in_scope(||
info!("received shutdown signal while waiting for Celestia reader task to initialize")
Expand All @@ -177,7 +177,7 @@ impl Reader {
#[instrument(skip_all, err)]
async fn initialize(
&mut self,
) -> eyre::Result<((), executor::Handle<StateIsInit>, tendermint::chain::Id)> {
) -> eyre::Result<(executor::Handle<StateIsInit>, tendermint::chain::Id)> {
let validate_celestia_chain_id = async {
let actual_celestia_chain_id = get_celestia_chain_id(&self.celestia_client)
.await
Expand Down Expand Up @@ -217,6 +217,7 @@ impl Reader {
wait_for_init_executor,
get_and_validate_sequencer_chain_id
)
.map(|((), executor_init, sequencer_chain_id)| (executor_init, sequencer_chain_id))
}
}

Expand Down

0 comments on commit 7a0e4d0

Please sign in to comment.