From ff91824c17ce51921c2331645abe2f2ef97c930a Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Wed, 6 Mar 2024 00:32:04 +0100
Subject: [PATCH] chore: rm more optimism features (#6981)

---
 crates/node-optimism/src/txpool.rs             |  4 ++--
 crates/transaction-pool/src/noop.rs            |  8 --------
 crates/transaction-pool/src/test_utils/mock.rs | 16 ++++++----------
 crates/transaction-pool/src/traits.rs          | 10 ----------
 4 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/crates/node-optimism/src/txpool.rs b/crates/node-optimism/src/txpool.rs
index 3f5765a19..b80289897 100644
--- a/crates/node-optimism/src/txpool.rs
+++ b/crates/node-optimism/src/txpool.rs
@@ -84,7 +84,7 @@ where
         origin: TransactionOrigin,
         transaction: Tx,
     ) -> TransactionValidationOutcome<Tx> {
-        if transaction.is_deposit() || transaction.is_eip4844() {
+        if transaction.is_eip4844() {
             return TransactionValidationOutcome::Invalid(
                 transaction,
                 InvalidTransactionError::TxTypeNotSupported.into(),
@@ -115,7 +115,7 @@ where
                 &self.chain_spec(),
                 self.block_timestamp(),
                 encoded.as_ref(),
-                valid_tx.transaction().is_deposit(),
+                false,
             ) {
                 Ok(cost) => cost,
                 Err(err) => {
diff --git a/crates/transaction-pool/src/noop.rs b/crates/transaction-pool/src/noop.rs
index 7fb57415c..c789d991f 100644
--- a/crates/transaction-pool/src/noop.rs
+++ b/crates/transaction-pool/src/noop.rs
@@ -260,14 +260,6 @@ impl<T: PoolTransaction> TransactionValidator for MockTransactionValidator<T> {
         origin: TransactionOrigin,
         transaction: Self::Transaction,
     ) -> TransactionValidationOutcome<Self::Transaction> {
-        #[cfg(feature = "optimism")]
-        if transaction.is_deposit() {
-            return TransactionValidationOutcome::Invalid(
-                transaction,
-                reth_primitives::InvalidTransactionError::TxTypeNotSupported.into(),
-            )
-        }
-
         // we return `balance: U256::MAX` to simulate a valid transaction which will never go into
         // overdraft
         TransactionValidationOutcome::Valid {
diff --git a/crates/transaction-pool/src/test_utils/mock.rs b/crates/transaction-pool/src/test_utils/mock.rs
index 20f75f6b3..581400ee5 100644
--- a/crates/transaction-pool/src/test_utils/mock.rs
+++ b/crates/transaction-pool/src/test_utils/mock.rs
@@ -290,13 +290,14 @@ impl MockTransaction {
     /// * [MockTransaction::eip1559]
     /// * [MockTransaction::eip4844]
     pub fn new_from_type(tx_type: TxType) -> Self {
+        #[allow(unreachable_patterns)]
         match tx_type {
             TxType::Legacy => Self::legacy(),
             TxType::EIP2930 => Self::eip2930(),
             TxType::EIP1559 => Self::eip1559(),
             TxType::EIP4844 => Self::eip4844(),
-            #[cfg(feature = "optimism")]
-            TxType::DEPOSIT => todo!(), // not handled in mock tx
+
+            _ => unreachable!("Invalid transaction type"),
         }
     }
 
@@ -717,12 +718,6 @@ impl PoolTransaction for MockTransaction {
     fn chain_id(&self) -> Option<u64> {
         Some(1)
     }
-
-    /// Returns true if the transaction is a deposit transaction.
-    #[cfg(feature = "optimism")]
-    fn is_deposit(&self) -> bool {
-        false
-    }
 }
 
 impl FromRecoveredTransaction for MockTransaction {
@@ -731,6 +726,8 @@ impl FromRecoveredTransaction for MockTransaction {
         let transaction = tx.into_signed();
         let hash = transaction.hash();
         let size = transaction.size();
+
+        #[allow(unreachable_patterns)]
         match transaction.transaction {
             Transaction::Legacy(TxLegacy {
                 chain_id: _,
@@ -822,8 +819,7 @@ impl FromRecoveredTransaction for MockTransaction {
                 accesslist: access_list,
                 size,
             },
-            #[cfg(feature = "optimism")]
-            Transaction::Deposit(_) => todo!(), // not handled in mock tx
+            _ => unreachable!("Invalid transaction type"),
         }
     }
 }
diff --git a/crates/transaction-pool/src/traits.rs b/crates/transaction-pool/src/traits.rs
index 8e974057b..c43f58c83 100644
--- a/crates/transaction-pool/src/traits.rs
+++ b/crates/transaction-pool/src/traits.rs
@@ -848,10 +848,6 @@ pub trait PoolTransaction:
 
     /// Returns chain_id
     fn chain_id(&self) -> Option<u64>;
-
-    /// Returns whether or not the transaction is an Optimism Deposited transaction.
-    #[cfg(feature = "optimism")]
-    fn is_deposit(&self) -> bool;
 }
 
 /// An extension trait that provides additional interfaces for the
@@ -1089,12 +1085,6 @@ impl PoolTransaction for EthPooledTransaction {
     fn chain_id(&self) -> Option<u64> {
         self.transaction.chain_id()
     }
-
-    /// Returns whether or not the transaction is an Optimism Deposited transaction.
-    #[cfg(feature = "optimism")]
-    fn is_deposit(&self) -> bool {
-        matches!(self.transaction.transaction, Transaction::Deposit(_))
-    }
 }
 
 impl EthPoolTransaction for EthPooledTransaction {