From 2fdd4733c4cc3214b69220bfcc6f5b9af7e41fc5 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 15 Oct 2024 17:38:59 -0400 Subject: [PATCH] refactor: change input output to Bytes --- crates/consensus/src/transaction/eip1559.rs | 2 +- crates/consensus/src/transaction/eip2930.rs | 2 +- crates/consensus/src/transaction/eip4844.rs | 10 +++++----- crates/consensus/src/transaction/eip7702.rs | 2 +- crates/consensus/src/transaction/envelope.rs | 4 ++-- crates/consensus/src/transaction/legacy.rs | 2 +- crates/consensus/src/transaction/mod.rs | 6 +++--- crates/consensus/src/transaction/typed.rs | 4 ++-- crates/rpc-types-eth/src/transaction/mod.rs | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/crates/consensus/src/transaction/eip1559.rs b/crates/consensus/src/transaction/eip1559.rs index 2d03c6fa9cc..7fa7f15b81c 100644 --- a/crates/consensus/src/transaction/eip1559.rs +++ b/crates/consensus/src/transaction/eip1559.rs @@ -304,7 +304,7 @@ impl Transaction for TxEip1559 { self.value } - fn input(&self) -> &[u8] { + fn input(&self) -> &Bytes { &self.input } diff --git a/crates/consensus/src/transaction/eip2930.rs b/crates/consensus/src/transaction/eip2930.rs index 412206a46e8..b2e820a8b98 100644 --- a/crates/consensus/src/transaction/eip2930.rs +++ b/crates/consensus/src/transaction/eip2930.rs @@ -268,7 +268,7 @@ impl Transaction for TxEip2930 { self.value } - fn input(&self) -> &[u8] { + fn input(&self) -> &Bytes { &self.input } diff --git a/crates/consensus/src/transaction/eip4844.rs b/crates/consensus/src/transaction/eip4844.rs index 123646d88d1..9bae3387618 100644 --- a/crates/consensus/src/transaction/eip4844.rs +++ b/crates/consensus/src/transaction/eip4844.rs @@ -257,10 +257,10 @@ impl Transaction for TxEip4844Variant { } } - fn input(&self) -> &[u8] { + fn input(&self) -> &Bytes { match self { - Self::TxEip4844(tx) => tx.input.as_ref(), - Self::TxEip4844WithSidecar(tx) => tx.tx().input.as_ref(), + Self::TxEip4844(tx) => tx.input(), + Self::TxEip4844WithSidecar(tx) => tx.tx().input(), } } @@ -725,7 +725,7 @@ impl Transaction for TxEip4844 { self.value } - fn input(&self) -> &[u8] { + fn input(&self) -> &Bytes { &self.input } @@ -998,7 +998,7 @@ impl Transaction for TxEip4844WithSidecar { self.tx.value() } - fn input(&self) -> &[u8] { + fn input(&self) -> &Bytes { self.tx.input() } diff --git a/crates/consensus/src/transaction/eip7702.rs b/crates/consensus/src/transaction/eip7702.rs index e915d3e5929..e0c34b7b6be 100644 --- a/crates/consensus/src/transaction/eip7702.rs +++ b/crates/consensus/src/transaction/eip7702.rs @@ -314,7 +314,7 @@ impl Transaction for TxEip7702 { self.value } - fn input(&self) -> &[u8] { + fn input(&self) -> &Bytes { &self.input } diff --git a/crates/consensus/src/transaction/envelope.rs b/crates/consensus/src/transaction/envelope.rs index 8fbfe21a5d9..da5d4072fe0 100644 --- a/crates/consensus/src/transaction/envelope.rs +++ b/crates/consensus/src/transaction/envelope.rs @@ -5,7 +5,7 @@ use alloy_eips::{ eip2718::{Decodable2718, Eip2718Error, Eip2718Result, Encodable2718}, eip2930::AccessList, }; -use alloy_primitives::{TxKind, B256}; +use alloy_primitives::{Bytes, TxKind, B256}; use alloy_rlp::{Decodable, Encodable, Header}; use crate::transaction::eip4844::{TxEip4844, TxEip4844Variant, TxEip4844WithSidecar}; @@ -467,7 +467,7 @@ impl Transaction for TxEnvelope { } } - fn input(&self) -> &[u8] { + fn input(&self) -> &Bytes { match self { Self::Legacy(tx) => tx.tx().input(), Self::Eip2930(tx) => tx.tx().input(), diff --git a/crates/consensus/src/transaction/legacy.rs b/crates/consensus/src/transaction/legacy.rs index a447ab67476..11010e7e0ba 100644 --- a/crates/consensus/src/transaction/legacy.rs +++ b/crates/consensus/src/transaction/legacy.rs @@ -246,7 +246,7 @@ impl Transaction for TxLegacy { self.value } - fn input(&self) -> &[u8] { + fn input(&self) -> &Bytes { &self.input } diff --git a/crates/consensus/src/transaction/mod.rs b/crates/consensus/src/transaction/mod.rs index 1e71987d7c1..3fee674bb33 100644 --- a/crates/consensus/src/transaction/mod.rs +++ b/crates/consensus/src/transaction/mod.rs @@ -3,7 +3,7 @@ use crate::Signed; use alloc::vec::Vec; use alloy_eips::{eip2930::AccessList, eip7702::SignedAuthorization}; -use alloy_primitives::{keccak256, Address, ChainId, TxKind, B256, U256}; +use alloy_primitives::{keccak256, Address, Bytes, ChainId, TxKind, B256, U256}; use core::any; mod eip1559; @@ -124,7 +124,7 @@ pub trait Transaction: any::Any + Send + Sync + 'static { fn value(&self) -> U256; /// Get `data`. - fn input(&self) -> &[u8]; + fn input(&self) -> &Bytes; /// Returns the transaction type fn ty(&self) -> u8; @@ -259,7 +259,7 @@ impl Transaction for alloy_serde::WithOtherFields { self.inner.value() } - fn input(&self) -> &[u8] { + fn input(&self) -> &Bytes { self.inner.input() } diff --git a/crates/consensus/src/transaction/typed.rs b/crates/consensus/src/transaction/typed.rs index 88b864401f1..af067e5f55e 100644 --- a/crates/consensus/src/transaction/typed.rs +++ b/crates/consensus/src/transaction/typed.rs @@ -1,5 +1,5 @@ use alloy_eips::{eip2930::AccessList, eip7702::SignedAuthorization}; -use alloy_primitives::{ChainId, TxKind, B256}; +use alloy_primitives::{Bytes, ChainId, TxKind, B256}; use crate::{ transaction::eip4844::{TxEip4844, TxEip4844Variant, TxEip4844WithSidecar}, @@ -236,7 +236,7 @@ impl Transaction for TypedTransaction { } } - fn input(&self) -> &[u8] { + fn input(&self) -> &Bytes { match self { Self::Legacy(tx) => tx.input(), Self::Eip2930(tx) => tx.input(), diff --git a/crates/rpc-types-eth/src/transaction/mod.rs b/crates/rpc-types-eth/src/transaction/mod.rs index 5099b0f2623..0c6bf437926 100644 --- a/crates/rpc-types-eth/src/transaction/mod.rs +++ b/crates/rpc-types-eth/src/transaction/mod.rs @@ -383,7 +383,7 @@ impl alloy_consensus::Transaction for Transaction { self.value } - fn input(&self) -> &[u8] { + fn input(&self) -> &Bytes { &self.input }