fix all integration tests (#41)

Author: akundaz

src/main.rs

@@ -96,13 +96,22 @@ fn build_pipeline(
 
 	let ws = Arc::new(WebSocketSink::new(cli_args.flashblocks_args.ws_address)?);
 
-	let flashblock_building_pipeline_steps = (
-		AppendOrders::from_pool(pool).with_ok_on_limit(),
-		OrderByPriorityFee::default(),
-		RemoveRevertedTransactions::default(),
-		BreakAfterDeadline,
-	)
-		.into_pipeline();
+	let flashblock_building_pipeline_steps = if cli_args.revert_protection {
+		(
+			AppendOrders::from_pool(pool).with_ok_on_limit(),
+			OrderByPriorityFee::default(),
+			RemoveRevertedTransactions::default(),
+			BreakAfterDeadline,
+		)
+			.into_pipeline()
+	} else {
+		(
+			AppendOrders::from_pool(pool).with_ok_on_limit(),
+			OrderByPriorityFee::default(),
+			BreakAfterDeadline,
+		)
+			.into_pipeline()
+	};
 
 	let flashblock_building_pipeline_steps = if let Some(ref signer) =
 		cli_args.builder_signer
@@ -121,8 +130,8 @@ fn build_pipeline(
 	let flashblock_number = Arc::new(FlashblockNumber::new());
 
 	let pipeline = Pipeline::<Flashblocks>::named("flashblocks")
-		.with_prologue(OptimismPrologue)
-		.with_prologue(FlashtestationsPrologue::try_new(
+		.with_step(OptimismPrologue)
+		.with_step(FlashtestationsPrologue::try_new(
 			cli_args.flashtestations.clone(),
 			cli_args.builder_signer.clone(),
 		)?)

src/platform.rs

@@ -14,7 +14,7 @@ use {
 /// the `Flashblocks` platform.
 ///
 /// See [`rblib::Platform`] for more details on platform definitions.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
 pub struct Flashblocks;
 
 impl Platform for Flashblocks {

src/tests/ordering.rs

@@ -1,8 +1,7 @@
 use {
 	crate::{platform::Flashblocks, tests::assert_has_sequencer_tx},
-	itertools::Itertools,
 	rblib::{
-		alloy::primitives::U256,
+		alloy::{consensus::Transaction, primitives::U256},
 		test_utils::{BlockResponseExt, TransactionRequestExt},
 	},
 	std::time::Duration,
@@ -17,10 +16,9 @@ use {
 async fn txs_ordered_by_priority_fee() -> eyre::Result<()> {
 	let (node, _) = Flashblocks::test_node().await?;
 
-	let tx_tips = vec![100, 300, 200, 500, 400];
-	let mut sent_txs = Vec::new();
+	let tx_tips = [100, 300, 200, 500, 400];
 	for (i, tip) in tx_tips.iter().enumerate() {
-		let tx = node
+		let _tx = node
 			.send_tx(
 				node
 					.build_tx()
@@ -30,33 +28,30 @@ async fn txs_ordered_by_priority_fee() -> eyre::Result<()> {
 					.max_priority_fee_per_gas(*tip),
 			)
 			.await?;
-		sent_txs.push(*tx.tx_hash());
 	}
 
 	// We need to wait to build the block
 	tokio::time::sleep(Duration::from_millis(100)).await;
 
-	let sorted_sent_txs: Vec<_> = tx_tips
-		.into_iter()
-		.zip(sent_txs)
-		.inspect(|(tip, hash)| println!("tip: {tip}, hash: {hash}"))
-		.sorted_by_key(|tuple| tuple.0)
-		.rev()
-		.map(|(_tip, hash)| hash)
-		.collect();
-
 	let block = node.next_block().await?;
 	assert_eq!(block.number(), 1);
 	assert_has_sequencer_tx!(&block);
 	assert_eq!(block.tx_count(), 6); // sequencer deposit tx + the 5 we sent
 
-	let hashes: Vec<_> = block
+	let base_fee = block.header.base_fee_per_gas.unwrap();
+
+	let tx_tips: Vec<_> = block
 		.transactions
 		.into_transactions()
-		.map(|tx| tx.inner.inner.tx_hash())
+		.skip(1) // skip the deposit transaction
+		.map(|tx| tx.effective_tip_per_gas(base_fee))
+		.rev() // we want to check descending order
 		.collect();
 
-	assert_eq!(sorted_sent_txs, hashes[1..]);
+	assert!(
+		tx_tips.is_sorted(),
+		"Transactions not ordered by fee priority"
+	);
 
 	Ok(())
 }

src/tests/standard.rs

@@ -71,7 +71,7 @@ async fn blocks_have_builder_tx() -> eyre::Result<()> {
 	debug!("produced block: {block:#?}");
 
 	assert_eq!(block.number(), 1);
-	assert_eq!(block.tx_count(), 2); // sequencer deposit tx + builder tx
+	assert_eq!(block.tx_count(), 9); // sequencer deposit tx + 8 builder txs for each flashblock
 
 	let builder_tx = block.tx(1).unwrap();
 	assert_eq!(builder_tx.nonce(), 0);