conflicts

alloy-rs · Mar 22, 2024 · 6deea34 · 6deea34
1 parent 65fcff1
commit 6deea34
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/crates/consensus/src/transaction/envelope.rs b/crates/consensus/src/transaction/envelope.rs
@@ -481,7 +481,7 @@ mod tests {
             max_fee_per_gas: 50_000_000_000,
             max_priority_fee_per_gas: 1_000_000_000_000,
             gas_limit: 1_000_000,
-            to: TxKind::Create,
+            to: Address::random(),
             value: U256::from(10e18),
             input: Bytes::new(),
             access_list: AccessList(vec![AccessListItem {
@@ -500,7 +500,7 @@ mod tests {
                 max_fee_per_gas: 50_000_000_000,
                 max_priority_fee_per_gas: 1_000_000_000_000,
                 gas_limit: 1_000_000,
-                to: TxKind::Create,
+                to: Address::random(),
                 value: U256::from(10e18),
                 input: Bytes::new(),
                 access_list: AccessList(vec![AccessListItem {

diff --git a/crates/eips/src/eip2930.rs b/crates/eips/src/eip2930.rs
@@ -48,7 +48,6 @@ impl AccessListItem {
     derive(proptest_derive::Arbitrary, arbitrary::Arbitrary)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
 pub struct AccessList(
     #[cfg_attr(
         all(any(test, feature = "arbitrary"), feature = "std"),