Added type alias 'BlockWithReceipts'

reilabs · Oct 2, 2024 · 1f0a4ae · 1f0a4ae
1 parent 7859ee6
commit 1f0a4ae
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/starknet-replay/src/storage/mod.rs b/starknet-replay/src/storage/mod.rs
@@ -15,6 +15,10 @@ use crate::{ReplayBlock, RunnerError};
 
 pub mod rpc;
 
+/// The type [`BlockWithReceipts`] bundles together all the block data: block
+/// header, transaction data and receipt data.
+pub type BlockWithReceipts = (BlockHeader, Vec<Transaction>, Vec<TransactionReceipt>);
+
 pub trait Storage {
     /// Returns the most recent block number available in the storage.
     ///
@@ -65,7 +69,7 @@ pub trait Storage {
     fn get_transactions_and_receipts_for_block(
         &self,
         block_number: BlockNumber,
-    ) -> Result<(BlockHeader, Vec<Transaction>, Vec<TransactionReceipt>), DatabaseError>;
+    ) -> Result<BlockWithReceipts, DatabaseError>;
 
     /// Replays the list of transactions in a block and returns the list of
     /// transactions traces.

diff --git a/starknet-replay/src/storage/rpc/mod.rs b/starknet-replay/src/storage/rpc/mod.rs
@@ -24,7 +24,7 @@ use rpc_client::RpcClient;
 use starknet_api::block::{BlockHeader, StarknetVersion};
 use starknet_api::core::{ClassHash, ContractAddress, PatriciaKey};
 use starknet_api::data_availability::L1DataAvailabilityMode;
-use starknet_api::transaction::{Transaction, TransactionExecutionStatus, TransactionReceipt};
+use starknet_api::transaction::{Transaction, TransactionExecutionStatus};
 use starknet_api::{contract_address, felt, patricia_key};
 use starknet_core::types::{
     ContractClass,
@@ -41,6 +41,7 @@ use tracing::{error, info, warn};
 use url::Url;
 
 use self::visited_pcs::VisitedPcsRaw;
+use super::BlockWithReceipts;
 use crate::block_number::BlockNumber;
 use crate::error::{DatabaseError, RunnerError};
 use crate::runner::replay_block::ReplayBlock;
@@ -342,7 +343,7 @@ impl ReplayStorage for RpcStorage {
     fn get_transactions_and_receipts_for_block(
         &self,
         block_number: BlockNumber,
-    ) -> Result<(BlockHeader, Vec<Transaction>, Vec<TransactionReceipt>), DatabaseError> {
+    ) -> Result<BlockWithReceipts, DatabaseError> {
         let transactions = self
             .rpc_client
             .starknet_get_block_with_receipts(&block_number)?;

diff --git a/starknet-replay/src/storage/rpc/rpc_client.rs b/starknet-replay/src/storage/rpc/rpc_client.rs
@@ -41,6 +41,7 @@ use crate::error::DatabaseError;
 use crate::runner::replay_class_hash::ReplayClassHash;
 use crate::storage::rpc::receipt::convert_receipt;
 use crate::storage::rpc::transaction::convert_transaction;
+use crate::storage::BlockWithReceipts;
 
 /// This structure partially implements a Starknet RPC client.
 ///
@@ -158,7 +159,7 @@ impl RpcClient {
                 let data_price_in_wei: u128 =
                     block.l1_data_gas_price.price_in_wei.to_string().parse()?;
 
-                let block_header: BlockHeader = BlockHeader {
+                let block_header = BlockHeader {
                     block_hash: BlockHash(Felt::from_bytes_be(&block.block_hash.to_bytes_be())),
                     parent_hash: BlockHash(Felt::from_bytes_be(&block.parent_hash.to_bytes_be())),
                     block_number: starknet_api::block::BlockNumber(block.block_number),
@@ -210,7 +211,7 @@ impl RpcClient {
     pub async fn starknet_get_block_with_receipts(
         &self,
         block_number: &BlockNumber,
-    ) -> Result<(BlockHeader, Vec<Transaction>, Vec<TransactionReceipt>), DatabaseError> {
+    ) -> Result<BlockWithReceipts, DatabaseError> {
         let block_id: BlockId = block_number.into();
         let txs_with_receipts: MaybePendingBlockWithReceipts = self
             .get_new_client()
@@ -228,7 +229,7 @@ impl RpcClient {
                 let data_price_in_wei: u128 =
                     block.l1_data_gas_price.price_in_wei.to_string().parse()?;
 
-                let block_header: BlockHeader = BlockHeader {
+                let block_header = BlockHeader {
                     block_hash: BlockHash(Felt::from_bytes_be(&block.block_hash.to_bytes_be())),
                     parent_hash: BlockHash(Felt::from_bytes_be(&block.parent_hash.to_bytes_be())),
                     block_number: starknet_api::block::BlockNumber(block.block_number),