refactor auctioneer into service and submodules

ralexstokes · Apr 29, 2024 · 13303b7 · 13303b7
1 parent 3311892
commit 13303b7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/mev-build-rs/src/auction_schedule.rs → ...ild-rs/src/auctioneer/auction_schedule.rs b/mev-build-rs/src/auction_schedule.rs → ...ild-rs/src/auctioneer/auction_schedule.rs
diff --git a/mev-build-rs/src/auctioneer/mod.rs 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 → mev-build-rs/src/auctioneer/service.rs b/mev-build-rs/src/auctioneer.rs → 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<String>,
 }
 
-pub struct Auctioneer<
+pub struct Service<
     Engine: EngineTypes<
         PayloadBuilderAttributes = BuilderPayloadBuilderAttributes,
         BuiltPayload = EthBuiltPayload,
@@ -112,7 +112,7 @@ impl<
                 PayloadBuilderAttributes = BuilderPayloadBuilderAttributes,
                 BuiltPayload = EthBuiltPayload,
             > + 'static,
-    > Auctioneer<Engine>
+    > Service<Engine>
 {
     pub fn new(
         clock: broadcast::Receiver<ClockMessage>,

diff --git 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
@@ -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<Context>,
 }
 
-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());