Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
SuperFluffy committed Jan 10, 2025
1 parent 8c71ed7 commit eff49f0
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 29 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ use astria_core::{
};
use astria_eyre::eyre::{
self,
Context,
bail,
ensure,
eyre,
Context,
};
use futures::{
Future,
Expand Down
10 changes: 5 additions & 5 deletions crates/astria-auctioneer/src/auctioneer/inner/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,21 @@ use astria_eyre::eyre::{
WrapErr as _,
};
use futures::{
StreamExt as _,
stream::FuturesUnordered,
StreamExt as _,
};
use tokio::select;
use tokio_util::sync::CancellationToken;
use tracing::{
Level,
Span,
error,
field,
info,
instrument,
Level,
Span,
};

use crate::{
Config,
Metrics,
rollup_channel::{
BundleStream,
ExecuteOptimisticBlockStream,
Expand All @@ -42,6 +40,8 @@ use crate::{
OptimisticBlockStream,
},
sequencer_key::SequencerKey,
Config,
Metrics,
};

mod auction;
Expand Down
6 changes: 3 additions & 3 deletions crates/astria-auctioneer/src/block/mod.rs
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
use astria_core::{
Protobuf,
execution,
generated::astria::{
bundle::v1alpha1 as raw_bundle,
sequencerblock::v1 as raw_sequencer_block,
},
primitive::v1::RollupId,
sequencerblock::v1::{
RollupTransactions,
block::{
self,
FilteredSequencerBlock,
FilteredSequencerBlockParts,
},
RollupTransactions,
},
Protobuf,
};
use astria_eyre::eyre::{
self,
Context,
eyre,
Context,
};
use bytes::Bytes;
use prost::Message as _;
Expand Down
16 changes: 8 additions & 8 deletions crates/astria-auctioneer/src/sequencer_channel.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
use std::{
pin::Pin,
task::{
ready,
Context,
Poll,
ready,
},
};

use astria_core::{
Protobuf as _,
generated::astria::sequencerblock::optimistic::v1alpha1::{
GetBlockCommitmentStreamRequest,
GetBlockCommitmentStreamResponse,
Expand All @@ -23,28 +22,29 @@ use astria_core::{
block::FilteredSequencerBlock,
optimistic::SequencerBlockCommit,
},
Protobuf as _,
};
use astria_eyre::eyre::{
self,
WrapErr as _,
eyre,
WrapErr as _,
};
use futures::{
stream::BoxStream,
Future,
Stream,
StreamExt as _,
stream::BoxStream,
};
use prost::Name;
use tracing::{
Instrument as _,
info_span,
warn,
Instrument as _,
};

use crate::streaming_utils::{
InstrumentedChannel,
restarting_stream,
InstrumentedChannel,
};

pub(crate) fn open(endpoint: &str) -> eyre::Result<SequencerChannel> {
Expand All @@ -69,8 +69,8 @@ impl SequencerChannel {
address: Address,
) -> impl Future<Output = eyre::Result<u32>> {
use astria_core::generated::astria::sequencerblock::v1::{
GetPendingNonceRequest,
sequencer_service_client::SequencerServiceClient,
GetPendingNonceRequest,
};

let mut client = SequencerServiceClient::new(self.inner.clone());
Expand Down Expand Up @@ -117,8 +117,8 @@ impl SequencerChannel {
rollup_id: RollupId,
) -> OptimisticBlockStream {
use astria_core::generated::astria::sequencerblock::optimistic::v1alpha1::{
GetOptimisticBlockStreamRequest,
optimistic_block_service_client::OptimisticBlockServiceClient,
GetOptimisticBlockStreamRequest,
};

let chan = self.inner.clone();
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-core/src/sequencerblock/v1/optimistic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use bytes::Bytes;

use super::block;
use crate::{
Protobuf,
generated::astria::sequencerblock::optimistic::v1alpha1 as raw,
Protobuf,
};

#[derive(Debug, thiserror::Error)]
Expand Down
22 changes: 11 additions & 11 deletions crates/astria-sequencer/src/grpc/optimistic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,45 +5,45 @@ use std::{
};

use astria_core::{
Protobuf,
generated::astria::sequencerblock::optimistic::v1alpha1::{
GetBlockCommitmentStreamRequest,
GetBlockCommitmentStreamResponse,
GetOptimisticBlockStreamRequest,
GetOptimisticBlockStreamResponse,
optimistic_block_service_server::{
OptimisticBlockService,
OptimisticBlockServiceServer,
},
GetBlockCommitmentStreamRequest,
GetBlockCommitmentStreamResponse,
GetOptimisticBlockStreamRequest,
GetOptimisticBlockStreamResponse,
},
primitive::v1::RollupId,
sequencerblock::v1::{
SequencerBlock,
block,
optimistic::SequencerBlockCommit,
SequencerBlock,
},
Protobuf,
};
use astria_eyre::{
eyre,
eyre::WrapErr as _,
};
use tendermint::{
Hash,
abci::request::FinalizeBlock,
Hash,
};
use tokio::{
sync::mpsc,
task::JoinSet,
};
use tokio_util::sync::CancellationToken;
use tonic::{
Request,
Response,
Status,
codegen::tokio_stream::{
Stream,
wrappers::ReceiverStream,
Stream,
},
Request,
Response,
Status,
};
use tracing::{
error,
Expand Down

0 comments on commit eff49f0

Please sign in to comment.