Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(conductor): don't return empty tuple #1885

Merged
merged 1 commit into from
Jan 6, 2025
Merged

chore(conductor): don't return empty tuple #1885

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions crates/astria-conductor/src/celestia/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::{

Check failure on line 1 in crates/astria-conductor/src/celestia/mod.rs

View workflow job for this annotation

GitHub Actions / Code Freeze

Code Freeze in Effect 

This file is under code freeze.

Check failure on line 1 in crates/astria-conductor/src/celestia/mod.rs

View workflow job for this annotation

GitHub Actions / Code Freeze

Code Freeze in Effect 

This file is under code freeze.

Check warning on line 1 in crates/astria-conductor/src/celestia/mod.rs

View workflow job for this annotation

GitHub Actions / Code Freeze

Code Freeze in Effect - Bypassed 

This file is under code freeze.
cmp::max,
sync::Arc,
time::Duration,
Expand Down Expand Up @@ -155,7 +155,7 @@

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 @@
#[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 @@
wait_for_init_executor,
get_and_validate_sequencer_chain_id
)
.map(|((), executor_init, sequencer_chain_id)| (executor_init, sequencer_chain_id))
}
}

Expand Down
Loading