remove the option for standard building

Author: akundaz

src/args.rs

@@ -78,14 +78,16 @@ pub struct FlashblocksArgs {
 
 	/// Enables flashblocks publishing on the specified WebSocket address.
 	/// If no address is specified defaults to 0.0.0.0:10111.
+	///
+	/// TODO: Rename this flag
 	#[arg(
 		long = "flashblocks",
     	name = "WS_ADDRESS",
 		env = "FLASHBLOCKS_WS_ADDRESS",
     	num_args = 0..=1,
 		default_missing_value = "0.0.0.0:10111"
 	)]
-	enabled: Option<SocketAddr>,
+	pub enabled: Option<SocketAddr>,
 
 	/// Should we calculate the state root for each flashblock
 	#[arg(
@@ -107,11 +109,6 @@ impl Default for BuilderArgs {
 }
 
 impl FlashblocksArgs {
-	/// Returns true if flashblocks are enabled.
-	pub fn enabled(&self) -> bool {
-		self.enabled.is_some()
-	}
-
 	/// Returns the WebSocket address for flashblocks publishing socket.
 	pub fn ws_address(&self) -> Option<SocketAddr> {
 		self.enabled

src/main.rs

@@ -79,49 +79,6 @@ fn main() {
 fn build_pipeline(
 	cli_args: &BuilderArgs,
 	pool: &OrderPool<Flashblocks>,
-) -> eyre::Result<Pipeline<Flashblocks>> {
-	let pipeline = if cli_args.flashblocks_args.enabled() {
-		build_flashblocks_pipeline(cli_args, pool)?
-	} else {
-		build_classic_pipeline(cli_args, pool)
-	};
-	pool.attach_pipeline(&pipeline);
-
-	Ok(pipeline)
-}
-
-/// Classic block builder
-///
-/// Block building strategy that builds blocks using the classic approach by
-/// producing one block payload per CL payload job.
-fn build_classic_pipeline(
-	cli_args: &BuilderArgs,
-	pool: &OrderPool<Flashblocks>,
-) -> Pipeline<Flashblocks> {
-	if cli_args.revert_protection {
-		Pipeline::<Flashblocks>::named("classic")
-			.with_prologue(OptimismPrologue)
-			.with_pipeline(
-				Loop,
-				(
-					AppendOrders::from_pool(pool),
-					OrderByPriorityFee::default(),
-					RemoveRevertedTransactions::default(),
-				),
-			)
-	} else {
-		Pipeline::<Flashblocks>::named("classic")
-			.with_prologue(OptimismPrologue)
-			.with_pipeline(
-				Loop,
-				(AppendOrders::from_pool(pool), OrderByPriorityFee::default()),
-			)
-	}
-}
-
-fn build_flashblocks_pipeline(
-	cli_args: &BuilderArgs,
-	pool: &OrderPool<Flashblocks>,
 ) -> eyre::Result<Pipeline<Flashblocks>> {
 	let socket_address = cli_args
 		.flashblocks_args
@@ -191,7 +148,9 @@ fn build_flashblocks_pipeline(
 				.with_step(BreakAfterMaxFlashblocks::new(flashblock_number)),
 		)
 		.with_limits(Scaled::default().deadline(total_building_time));
+
 	ws.watch_shutdown(&pipeline);
+	pool.attach_pipeline(&pipeline);
 
 	Ok(pipeline)
 }

src/tests/args.rs

@@ -72,7 +72,7 @@ fn test_leeway_time_with_flashblocks_enabled() {
 	if let Commands::Node(node_command) = args.command {
 		let flashblocks_args = &node_command.ext.flashblocks_args;
 		assert_eq!(flashblocks_args.leeway_time, Duration::from_millis(150));
-		assert!(flashblocks_args.enabled());
+		assert!(flashblocks_args.enabled.is_some());
 		assert_eq!(
 			flashblocks_args.ws_address().unwrap().to_string(),
 			"127.0.0.1:8080"