chore(primitives): remove redundant intermediary type (#350)

Author: kariy

crates/executor/src/implementation/blockifier/mod.rs

@@ -228,7 +228,7 @@ impl<'a> BlockExecutor<'a> for StarknetVMProcessor<'a> {
                 None
             };
 
-            let tx = TxWithHash::from(&exec_tx);
+            let tx = TxWithHash::from(exec_tx.clone());
             let hash = tx.hash;
             let result = utils::transact(
                 &mut state.cached_state,

crates/executor/src/implementation/blockifier/utils.rs

@@ -143,7 +143,7 @@ pub fn transact<S: StateReader>(
 
             tx_state.commit();
 
-            let receipt = build_receipt(tx.tx_ref(), fee, &info);
+            let receipt = build_receipt(&tx.transaction, fee, &info);
             Ok(ExecutionResult::new_success(receipt, info))
         }
 

crates/executor/src/utils.rs

@@ -5,7 +5,7 @@ use katana_primitives::receipt::{
     self, DataAvailabilityResources, DeclareTxReceipt, DeployAccountTxReceipt, Event, GasUsed,
     InvokeTxReceipt, L1HandlerTxReceipt, MessageToL1, Receipt,
 };
-use katana_primitives::transaction::TxRef;
+use katana_primitives::transaction::ExecutableTx;
 use tracing::trace;
 
 pub(crate) const LOG_TARGET: &str = "executor";
@@ -27,7 +27,7 @@ pub fn log_resources(resources: &TransactionResources) {
 }
 
 pub(crate) fn build_receipt(
-    tx: TxRef<'_>,
+    tx: &ExecutableTx,
     fee: FeeInfo,
     info: &TransactionExecutionInfo,
 ) -> Receipt {
@@ -37,23 +37,23 @@ pub(crate) fn build_receipt(
     let revert_error = info.revert_error.as_ref().map(|e| e.to_string());
 
     match tx {
-        TxRef::Invoke(_) => Receipt::Invoke(InvokeTxReceipt {
+        ExecutableTx::Invoke(_) => Receipt::Invoke(InvokeTxReceipt {
             events,
             fee,
             revert_error,
             messages_sent,
             execution_resources,
         }),
 
-        TxRef::Declare(_) => Receipt::Declare(DeclareTxReceipt {
+        ExecutableTx::Declare(_) => Receipt::Declare(DeclareTxReceipt {
             events,
             fee,
             revert_error,
             messages_sent,
             execution_resources,
         }),
 
-        TxRef::L1Handler(tx) => Receipt::L1Handler(L1HandlerTxReceipt {
+        ExecutableTx::L1Handler(tx) => Receipt::L1Handler(L1HandlerTxReceipt {
             events,
             fee,
             revert_error,
@@ -62,7 +62,7 @@ pub(crate) fn build_receipt(
             execution_resources,
         }),
 
-        TxRef::DeployAccount(tx) => Receipt::DeployAccount(DeployAccountTxReceipt {
+        ExecutableTx::DeployAccount(tx) => Receipt::DeployAccount(DeployAccountTxReceipt {
             events,
             fee,
             revert_error,

crates/executor/tests/executor.rs

@@ -41,7 +41,7 @@ fn test_executor_with_valid_blocks_impl<EF: ExecutorFactory>(
     //
 
     let block = &blocks[0];
-    expected_txs.extend(block.body.iter().map(|t| t.into()));
+    expected_txs.extend(block.body.iter().map(|t| t.clone().into()));
 
     executor.execute_block(block.clone()).unwrap();
 
@@ -124,7 +124,7 @@ fn test_executor_with_valid_blocks_impl<EF: ExecutorFactory>(
     //
 
     let block = &blocks[1];
-    expected_txs.extend(block.body.iter().map(|t| t.into()));
+    expected_txs.extend(block.body.iter().map(|t| t.clone().into()));
 
     executor.execute_block(block.clone()).unwrap();
 
@@ -171,7 +171,7 @@ fn test_executor_with_valid_blocks_impl<EF: ExecutorFactory>(
     //
 
     let block = &blocks[2];
-    expected_txs.extend(block.body.iter().map(|t| t.into()));
+    expected_txs.extend(block.body.iter().map(|t| t.clone().into()));
 
     executor.execute_block(block.clone()).unwrap();
 

crates/primitives/src/transaction.rs

@@ -108,25 +108,6 @@ impl Tx {
     }
 }
 
-#[derive(Debug)]
-pub enum TxRef<'a> {
-    Invoke(&'a InvokeTx),
-    Declare(&'a DeclareTx),
-    L1Handler(&'a L1HandlerTx),
-    DeployAccount(&'a DeployAccountTx),
-}
-
-impl<'a> From<TxRef<'a>> for Tx {
-    fn from(value: TxRef<'a>) -> Self {
-        match value {
-            TxRef::Invoke(tx) => Tx::Invoke(tx.clone()),
-            TxRef::Declare(tx) => Tx::Declare(tx.clone()),
-            TxRef::L1Handler(tx) => Tx::L1Handler(tx.clone()),
-            TxRef::DeployAccount(tx) => Tx::DeployAccount(tx.clone()),
-        }
-    }
-}
-
 /// Represents a transaction that has all the necessary data to be executed.
 #[derive(Debug, Clone, From, PartialEq, Eq)]
 pub enum ExecutableTx {
@@ -146,15 +127,6 @@ impl ExecutableTx {
         }
     }
 
-    pub fn tx_ref(&self) -> TxRef<'_> {
-        match self {
-            ExecutableTx::Invoke(tx) => TxRef::Invoke(tx),
-            ExecutableTx::L1Handler(tx) => TxRef::L1Handler(tx),
-            ExecutableTx::Declare(tx) => TxRef::Declare(tx),
-            ExecutableTx::DeployAccount(tx) => TxRef::DeployAccount(tx),
-        }
-    }
-
     pub fn r#type(&self) -> TxType {
         match self {
             ExecutableTx::Invoke(_) => TxType::Invoke,
@@ -748,12 +720,17 @@ pub struct TxWithHash {
 
 impl From<ExecutableTxWithHash> for TxWithHash {
     fn from(tx: ExecutableTxWithHash) -> Self {
-        Self { hash: tx.hash, transaction: tx.tx_ref().into() }
+        Self { hash: tx.hash, transaction: tx.transaction.into() }
     }
 }
 
-impl From<&ExecutableTxWithHash> for TxWithHash {
-    fn from(tx: &ExecutableTxWithHash) -> Self {
-        Self { hash: tx.hash, transaction: tx.tx_ref().into() }
+impl From<ExecutableTx> for Tx {
+    fn from(tx: ExecutableTx) -> Self {
+        match tx {
+            ExecutableTx::Invoke(tx) => Tx::Invoke(tx),
+            ExecutableTx::L1Handler(tx) => Tx::L1Handler(tx),
+            ExecutableTx::Declare(tx) => Tx::Declare(tx.transaction),
+            ExecutableTx::DeployAccount(tx) => Tx::DeployAccount(tx),
+        }
     }
 }