test: span nit

Author: julio4

src/payload/ext/span.rs

@@ -1,5 +1,7 @@
 use crate::{
-	alloy::primitives::TxHash, prelude::*, reth::primitives::Recovered,
+	alloy::primitives::TxHash,
+	prelude::*,
+	reth::primitives::Recovered,
 };
 
 /// Quality of Life extensions for the `Span` type.
@@ -107,13 +109,12 @@ impl<P: Platform> SpanExt<P> for Span<P> {
 
 #[cfg(test)]
 mod span_ext_tests {
-	use crate::{
-		payload::{Span, SpanExt},
-		prelude::{BlockContext, Checkpoint, Ethereum},
-		test_utils::BlockContextMocked,
-	};
-
 	use {
+		crate::{
+			payload::{Span, SpanExt},
+			prelude::{BlockContext, Checkpoint, Ethereum},
+			test_utils::BlockContextMocked,
+		},
 		alloy::{
 			consensus::{EthereumTxEnvelope, TxEip4844},
 			network::{TransactionBuilder, TxSignerSync},
@@ -154,7 +155,7 @@ mod span_ext_tests {
 
 	#[test]
 	fn gas_and_blob_gas_used_sum_correctly() {
-		let (block, _) = BlockContext::<Ethereum>::mocked();
+		let block = BlockContext::<Ethereum>::mocked();
 
 		let root = block.start();
 		let c1: Checkpoint<Ethereum> = root.barrier();
@@ -168,7 +169,7 @@ mod span_ext_tests {
 
 	#[test]
 	fn contains_transaction_hash_works() {
-		let (block, _) = BlockContext::<Ethereum>::mocked();
+		let block = BlockContext::<Ethereum>::mocked();
 
 		let root = block.start();
 		let c1: Checkpoint<Ethereum> = root.barrier();
@@ -184,7 +185,7 @@ mod span_ext_tests {
 
 	#[test]
 	fn split_at_produces_valid_halves() {
-		let (block, _) = BlockContext::<Ethereum>::mocked();
+		let block = BlockContext::<Ethereum>::mocked();
 
 		let root = block.start();
 		let c1: Checkpoint<Ethereum> = root.barrier();
@@ -203,7 +204,7 @@ mod span_ext_tests {
 
 	#[test]
 	fn take_and_skip_are_consistent_with_split_at() {
-		let (block, _) = BlockContext::<Ethereum>::mocked();
+		let block = BlockContext::<Ethereum>::mocked();
 
 		let root = block.start();
 		let c1: Checkpoint<Ethereum> = root.barrier();

src/payload/span.rs

@@ -192,23 +192,24 @@ mod tests {
 
 	#[test]
 	fn span_between_linear_history() {
-		let (block, _) = BlockContext::<Ethereum>::mocked();
+		let block = BlockContext::<Ethereum>::mocked();
 
 		let checkpoint = block.start();
 		let c1: Checkpoint<Ethereum> = checkpoint.barrier();
 		let c2: Checkpoint<Ethereum> = c1.barrier();
 
 		// Direct ancestor-descendant pair
-		let span = Span::<Ethereum>::between(&checkpoint, &c2).unwrap();
+		let mut span = Span::<Ethereum>::between(&checkpoint, &c2).unwrap();
 		assert_eq!(span.len(), 3);
-		assert_eq!(span.first().unwrap(), &checkpoint);
+		assert_eq!(span.pop_first().unwrap(), checkpoint);
 		assert_eq!(span.len(), 2);
-		assert_eq!(span.last().unwrap(), &c2);
+		assert_eq!(span.pop_last().unwrap(), c2);
+		assert_eq!(span.len(), 1);
 	}
 
 	#[test]
 	fn test_empty_span() {
-		let (block, _) = BlockContext::<Ethereum>::mocked();
+		let block = BlockContext::<Ethereum>::mocked();
 
 		let checkpoint = block.start();
 
@@ -219,7 +220,7 @@ mod tests {
 
 	#[test]
 	fn test_between_nonlinear_history() {
-		let (block, _) = BlockContext::<Ethereum>::mocked();
+		let block = BlockContext::<Ethereum>::mocked();
 
 		let checkpoint1 = block.start();
 		let checkpoint2 = block.start();
@@ -230,7 +231,7 @@ mod tests {
 
 	#[test]
 	fn into_iter_and_iterators_work() {
-		let (block, _) = BlockContext::<Ethereum>::mocked();
+		let block = BlockContext::<Ethereum>::mocked();
 
 		let root = block.start();
 		let c1: Checkpoint<Ethereum> = root.barrier();
@@ -245,8 +246,7 @@ mod tests {
 		assert_eq!(ids_from_iter[2], c2);
 
 		// into_iter()
-		let ids_from_into_iter: Vec<_> =
-			span.clone().into_iter().map(|c| c).collect();
+		let ids_from_into_iter: Vec<_> = span.clone().into_iter().collect();
 		assert_eq!(ids_from_iter, ids_from_into_iter);
 	}
 }