fix: Adding test and using existing method

Author: NicoMolinaOZ

src/services/blockchain/client.rs

@@ -36,18 +36,6 @@ pub trait BlockChainClient: Send + Sync + Clone {
 		start_block: u64,
 		end_block: Option<u64>,
 	) -> Result<Vec<BlockType>, anyhow::Error>;
-
-	/// Retrieves a specific block by its number
-	///
-	/// # Arguments
-	/// * `block_number` - The block number to retrieve
-	///
-	/// # Returns
-	/// * `Result<Option<BlockType>, anyhow::Error>`
-	async fn get_block_by_number(
-		&self,
-		block_number: &u64,
-	) -> Result<Option<BlockType>, anyhow::Error>;
 }
 
 /// Defines the factory interface for creating block filters

src/services/blockchain/clients/evm/client.rs

@@ -244,32 +244,4 @@ impl<T: Send + Sync + Clone + BlockchainTransport> BlockChainClient for EvmClien
 			.into_iter()
 			.collect::<Result<Vec<_>, _>>()
 	}
-
-	async fn get_block_by_number(
-		&self,
-		block_number: &u64,
-	) -> Result<Option<BlockType>, anyhow::Error> {
-		let client = self.alloy_client.clone();
-		let params = json!([
-			format!("0x{:x}", block_number),
-			true // include full transaction objects
-		]);
-		let response = client
-			.send_raw_request("eth_getBlockByNumber", Some(params))
-			.await
-			.with_context(|| format!("Failed to get block: {}", block_number))?;
-
-		let block_data = response
-			.get("result")
-			.ok_or_else(|| anyhow::anyhow!("Missing 'result' field"))?;
-
-		if block_data.is_null() {
-			return Ok(None);
-		}
-
-		let block: EVMBlock = serde_json::from_value(block_data.clone())
-			.map_err(|e| anyhow::anyhow!("Failed to parse block: {}", e))?;
-
-		Ok(Some(BlockType::EVM(Box::new(block))))
-	}
 }

src/services/blockchain/clients/stellar/client.rs

@@ -350,33 +350,4 @@ impl<T: Send + Sync + Clone + BlockchainTransport> BlockChainClient for StellarC
 		}
 		Ok(blocks)
 	}
-
-	/// Retrieves a block by number
-	///
-	/// # Errors
-	/// - Returns `BlockChainError::RequestError` if a block cannot be retrieved
-	#[instrument(skip(self), fields(block_number))]
-	async fn get_block_by_number(
-		&self,
-		block_number: &u64,
-	) -> Result<Option<BlockType>, anyhow::Error> {
-		let params = json!({
-			"startLedger": block_number,
-			"pagination": {
-				"limit": 1
-			}
-		});
-
-		let response = self
-			.stellar_client
-			.send_raw_request("getLedgers", Some(params))
-			.await
-			.with_context(|| format!("Failed to fetch ledger number {}", block_number))?;
-
-		let ledgers: Vec<StellarBlock> =
-			serde_json::from_value(response["result"]["ledgers"].clone())
-				.with_context(|| "Failed to parse ledger response")?;
-
-		Ok(Some(BlockType::Stellar(Box::new(ledgers[0].clone()))))
-	}
 }

src/utils/monitor/execution.rs

@@ -84,18 +84,15 @@ pub async fn execute_monitor<T: ClientPoolTrait, N: NetworkRepositoryTrait>(
 				)
 			})?;
 
-			let block = client
-				.get_block_by_number(block_number)
-				.await
-				.map_err(|e| {
-					MonitorExecutionError::execution_error(
-						format!("Failed to get block {}: {}", block_number, e),
-						None,
-						None,
-					)
-				})?;
+			let blocks = client.get_blocks(*block_number, None).await.map_err(|e| {
+				MonitorExecutionError::execution_error(
+					format!("Failed to get block {}: {}", block_number, e),
+					None,
+					None,
+				)
+			})?;
 
-			let block = block.ok_or_else(|| {
+			let block = blocks.first().ok_or_else(|| {
 				MonitorExecutionError::execution_error(
 					format!("Block {} not found", block_number),
 					None,
@@ -104,7 +101,7 @@ pub async fn execute_monitor<T: ClientPoolTrait, N: NetworkRepositoryTrait>(
 			})?;
 
 			filter_service
-				.filter_block(&*client, &network, &block, &[monitor.clone()])
+				.filter_block(&*client, &network, block, &[monitor.clone()])
 				.await
 				.map_err(|e| {
 					MonitorExecutionError::execution_error(
@@ -127,18 +124,15 @@ pub async fn execute_monitor<T: ClientPoolTrait, N: NetworkRepositoryTrait>(
 					)
 				})?;
 
-			let block = client
-				.get_block_by_number(block_number)
-				.await
-				.map_err(|e| {
-					MonitorExecutionError::execution_error(
-						format!("Failed to get block {}: {}", block_number, e),
-						None,
-						None,
-					)
-				})?;
+			let blocks = client.get_blocks(*block_number, None).await.map_err(|e| {
+				MonitorExecutionError::execution_error(
+					format!("Failed to get block {}: {}", block_number, e),
+					None,
+					None,
+				)
+			})?;
 
-			let block = block.ok_or_else(|| {
+			let block = blocks.first().ok_or_else(|| {
 				MonitorExecutionError::execution_error(
 					format!("Block {} not found", block_number),
 					None,
@@ -147,7 +141,7 @@ pub async fn execute_monitor<T: ClientPoolTrait, N: NetworkRepositoryTrait>(
 			})?;
 
 			filter_service
-				.filter_block(&*client, &network, &block, &[monitor.clone()])
+				.filter_block(&*client, &network, block, &[monitor.clone()])
 				.await
 				.map_err(|e| {
 					MonitorExecutionError::execution_error(

tests/integration/mocks/clients.rs

@@ -46,10 +46,6 @@ mock! {
 			start_block: u64,
 			end_block: Option<u64>,
 		) -> Result<Vec<BlockType>, anyhow::Error>;
-		async fn get_block_by_number(
-			&self,
-			block_number: &u64,
-		) -> Result<Option<BlockType>, anyhow::Error>;
 	}
 
 	#[async_trait]
@@ -90,10 +86,6 @@ mock! {
 			start_block: u64,
 			end_block: Option<u64>,
 		) -> Result<Vec<BlockType>, anyhow::Error>;
-		async fn get_block_by_number(
-			&self,
-			block_number: &u64,
-		) -> Result<Option<BlockType>, anyhow::Error>;
 	}
 
 	#[async_trait]

tests/integration/monitor/execution.rs

@@ -5,6 +5,7 @@ use crate::integration::{
 		MockStellarClientTrait,
 	},
 };
+use mockall::predicate;
 use openzeppelin_monitor::{
 	models::{BlockChainType, EVMTransactionReceipt},
 	repositories::NetworkService,
@@ -37,8 +38,9 @@ async fn test_execute_monitor_evm() {
 	let mut mock_client = MockEvmClientTrait::new();
 
 	mock_client
-		.expect_get_block_by_number()
-		.return_once(move |_| Ok(Some(test_data.blocks[0].clone())));
+		.expect_get_blocks()
+		.with(predicate::eq(21305050u64), predicate::eq(None))
+		.return_once(move |_, _| Ok(test_data.blocks.clone()));
 
 	let receipts = test_data.receipts.clone();
 	let receipt_map: std::collections::HashMap<String, EVMTransactionReceipt> = receipts
@@ -120,8 +122,9 @@ async fn test_execute_monitor_evm_wrong_block_number() {
 	let mut mock_client = MockEvmClientTrait::new();
 
 	mock_client
-		.expect_get_block_by_number()
-		.return_once(move |_| Ok(None));
+		.expect_get_blocks()
+		.with(predicate::eq(1u64), predicate::eq(None))
+		.return_once(move |_, _| Ok(vec![]));
 
 	mock_pool
 		.expect_get_evm_client()
@@ -151,8 +154,9 @@ async fn test_execute_monitor_evm_failed_to_get_block_by_number() {
 	let mut mock_client = MockEvmClientTrait::new();
 
 	mock_client
-		.expect_get_block_by_number()
-		.return_once(move |_| Err(anyhow::anyhow!("Failed to get block by number")));
+		.expect_get_blocks()
+		.with(predicate::eq(1u64), predicate::eq(None))
+		.return_once(move |_, _| Err(anyhow::anyhow!("Failed to get block by number")));
 
 	mock_pool
 		.expect_get_evm_client()
@@ -209,8 +213,9 @@ async fn test_execute_monitor_stellar() {
 	let mut mock_client = MockStellarClientTrait::new();
 
 	mock_client
-		.expect_get_block_by_number()
-		.return_once(move |_| Ok(Some(test_data.blocks[0].clone())));
+		.expect_get_blocks()
+		.with(predicate::eq(172627u64), predicate::eq(None))
+		.return_once(move |_, _| Ok(test_data.blocks.clone()));
 	mock_client
 		.expect_get_transactions()
 		.return_once(move |_, _| Ok(test_data.stellar_transactions.clone()));
@@ -279,8 +284,9 @@ async fn test_execute_monitor_failed_to_get_block() {
 	let mut mock_client = MockStellarClientTrait::new();
 
 	mock_client
-		.expect_get_block_by_number()
-		.return_once(move |_| Ok(None));
+		.expect_get_blocks()
+		.with(predicate::eq(172627u64), predicate::eq(None))
+		.return_once(move |_, _| Ok(vec![]));
 
 	mock_pool
 		.expect_get_stellar_client()
@@ -336,8 +342,9 @@ async fn test_execute_monitor_failed_to_get_block_by_number() {
 	let mut mock_client = MockStellarClientTrait::new();
 
 	mock_client
-		.expect_get_block_by_number()
-		.return_once(move |_| Err(anyhow::anyhow!("Failed to get block by number")));
+		.expect_get_blocks()
+		.with(predicate::eq(172627u64), predicate::eq(None))
+		.return_once(move |_, _| Err(anyhow::anyhow!("Failed to get block by number")));
 
 	mock_pool
 		.expect_get_stellar_client()