diff --git a/mev-build-rs/src/auction_schedule.rs b/mev-build-rs/src/auctioneer/auction_schedule.rs similarity index 100% rename from mev-build-rs/src/auction_schedule.rs rename to mev-build-rs/src/auctioneer/auction_schedule.rs diff --git a/mev-build-rs/src/auctioneer/mod.rs b/mev-build-rs/src/auctioneer/mod.rs new file mode 100644 index 00000000..67201e0b --- /dev/null +++ b/mev-build-rs/src/auctioneer/mod.rs @@ -0,0 +1,4 @@ +mod auction_schedule; +mod service; + +pub use service::{AuctionContext, Config, Service}; diff --git a/mev-build-rs/src/auctioneer.rs b/mev-build-rs/src/auctioneer/service.rs similarity index 98% rename from mev-build-rs/src/auctioneer.rs rename to mev-build-rs/src/auctioneer/service.rs index 102a241a..e31056b6 100644 --- a/mev-build-rs/src/auctioneer.rs +++ b/mev-build-rs/src/auctioneer/service.rs @@ -1,5 +1,5 @@ use crate::{ - auction_schedule::{AuctionSchedule, Proposals, Proposer, RelaySet}, + auctioneer::auction_schedule::{AuctionSchedule, Proposals, Proposer, RelaySet}, bidder::{BidStatus, Message as BidderMessage}, payload::builder_attributes::{BuilderPayloadBuilderAttributes, ProposalAttributes}, service::ClockMessage, @@ -86,7 +86,7 @@ pub struct Config { pub relays: Vec, } -pub struct Auctioneer< +pub struct Service< Engine: EngineTypes< PayloadBuilderAttributes = BuilderPayloadBuilderAttributes, BuiltPayload = EthBuiltPayload, @@ -112,7 +112,7 @@ impl< PayloadBuilderAttributes = BuilderPayloadBuilderAttributes, BuiltPayload = EthBuiltPayload, > + 'static, - > Auctioneer + > Service { pub fn new( clock: broadcast::Receiver, diff --git a/mev-build-rs/src/lib.rs b/mev-build-rs/src/lib.rs index 3e73702c..a31a7a8f 100644 --- a/mev-build-rs/src/lib.rs +++ b/mev-build-rs/src/lib.rs @@ -1,4 +1,3 @@ -mod auction_schedule; mod auctioneer; mod bidder; mod error; diff --git a/mev-build-rs/src/service.rs b/mev-build-rs/src/service.rs index 133a5d0f..994f4fb4 100644 --- a/mev-build-rs/src/service.rs +++ b/mev-build-rs/src/service.rs @@ -1,5 +1,5 @@ use crate::{ - auctioneer::{Auctioneer, Config as AuctioneerConfig}, + auctioneer::{Config as AuctioneerConfig, Service as Auctioneer}, bidder::{Config as BidderConfig, Service as Bidder}, node::BuilderNode, payload::{ @@ -64,7 +64,7 @@ pub struct Services< pub context: Arc, } -pub async fn construct< +pub async fn construct_services< Engine: EngineTypes< PayloadBuilderAttributes = BuilderPayloadBuilderAttributes, BuiltPayload = EthBuiltPayload, @@ -140,7 +140,7 @@ pub async fn launch( let task_executor = handle.node.task_executor.clone(); let payload_builder = handle.node.payload_builder.clone(); let Services { auctioneer, bidder, clock, clock_tx, context } = - construct(network, config, task_executor, payload_builder).await?; + construct_services(network, config, task_executor, payload_builder).await?; handle.node.task_executor.spawn_critical_blocking("mev-builder/auctioneer", auctioneer.spawn()); handle.node.task_executor.spawn_critical_blocking("mev-builder/bidder", bidder.spawn());