From 9db17123b42a49fc911abb8fc4e92b26b9749c80 Mon Sep 17 00:00:00 2001
From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com>
Date: Wed, 24 Apr 2024 11:32:22 +0200
Subject: [PATCH] refactor: replace `to_primitive_transaction_kind` by `From`
 impl (#7831)

---
 crates/primitives/src/transaction/mod.rs       |  9 +++++++++
 .../rpc-types-compat/src/transaction/typed.rs  | 18 ++++--------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/crates/primitives/src/transaction/mod.rs b/crates/primitives/src/transaction/mod.rs
index 31cb277f00..c2df133053 100644
--- a/crates/primitives/src/transaction/mod.rs
+++ b/crates/primitives/src/transaction/mod.rs
@@ -868,6 +868,15 @@ impl TransactionKind {
     }
 }
 
+impl From<reth_rpc_types::TransactionKind> for TransactionKind {
+    fn from(kind: reth_rpc_types::TransactionKind) -> Self {
+        match kind {
+            reth_rpc_types::TransactionKind::Call(to) => Self::Call(to),
+            reth_rpc_types::TransactionKind::Create => Self::Create,
+        }
+    }
+}
+
 impl Compact for TransactionKind {
     fn to_compact<B>(self, buf: &mut B) -> usize
     where
diff --git a/crates/rpc/rpc-types-compat/src/transaction/typed.rs b/crates/rpc/rpc-types-compat/src/transaction/typed.rs
index cc90c626ec..6b0ed52947 100644
--- a/crates/rpc/rpc-types-compat/src/transaction/typed.rs
+++ b/crates/rpc/rpc-types-compat/src/transaction/typed.rs
@@ -16,7 +16,7 @@ pub fn to_primitive_transaction(
             nonce: tx.nonce,
             gas_price: tx.gas_price.to(),
             gas_limit: tx.gas_limit.try_into().ok()?,
-            to: to_primitive_transaction_kind(tx.kind),
+            to: tx.kind.into(),
             value: tx.value,
             input: tx.input,
         }),
@@ -25,7 +25,7 @@ pub fn to_primitive_transaction(
             nonce: tx.nonce,
             gas_price: tx.gas_price.to(),
             gas_limit: tx.gas_limit.try_into().ok()?,
-            to: to_primitive_transaction_kind(tx.kind),
+            to: tx.kind.into(),
             value: tx.value,
             input: tx.input,
             access_list: tx.access_list,
@@ -35,7 +35,7 @@ pub fn to_primitive_transaction(
             nonce: tx.nonce,
             max_fee_per_gas: tx.max_fee_per_gas.to(),
             gas_limit: tx.gas_limit.try_into().ok()?,
-            to: to_primitive_transaction_kind(tx.kind),
+            to: tx.kind.into(),
             value: tx.value,
             input: tx.input,
             access_list: tx.access_list,
@@ -47,7 +47,7 @@ pub fn to_primitive_transaction(
             gas_limit: tx.gas_limit.to(),
             max_fee_per_gas: tx.max_fee_per_gas.to(),
             max_priority_fee_per_gas: tx.max_priority_fee_per_gas.to(),
-            to: to_primitive_transaction_kind(tx.kind),
+            to: tx.kind.into(),
             value: tx.value,
             access_list: tx.access_list,
             blob_versioned_hashes: tx.blob_versioned_hashes,
@@ -56,13 +56,3 @@ pub fn to_primitive_transaction(
         }),
     })
 }
-
-/// Transforms a [reth_rpc_types::TransactionKind] into a [reth_primitives::TransactionKind]
-pub fn to_primitive_transaction_kind(
-    kind: reth_rpc_types::TransactionKind,
-) -> reth_primitives::TransactionKind {
-    match kind {
-        reth_rpc_types::TransactionKind::Call(to) => reth_primitives::TransactionKind::Call(to),
-        reth_rpc_types::TransactionKind::Create => reth_primitives::TransactionKind::Create,
-    }
-}