testing: clean up reth-primitives import (#10760)

Cargo.lock

@@ -2550,6 +2550,7 @@ dependencies = [
 name = "ef-tests"
 version = "1.0.6"
 dependencies = [
+ "alloy-primitives",
  "alloy-rlp",
  "rayon",
  "reth-chainspec",
@@ -8698,6 +8699,7 @@ version = "1.0.6"
 dependencies = [
  "alloy-eips",
  "alloy-genesis",
+ "alloy-primitives",
  "rand 0.8.5",
  "reth-primitives",
  "secp256k1",

testing/ef-tests/Cargo.toml

@@ -25,6 +25,7 @@ reth-stages.workspace = true
 reth-evm-ethereum.workspace = true
 
 alloy-rlp.workspace = true
+alloy-primitives.workspace = true
 
 walkdir = "2.3.3"
 serde.workspace = true

testing/ef-tests/src/models.rs

@@ -1,6 +1,7 @@
 //! Shared models for <https://github.com/ethereum/tests>
 
 use crate::{assert::assert_equal, Error};
+use alloy_primitives::{Address, Bloom, Bytes, B256, B64, U256};
 use reth_chainspec::{ChainSpec, ChainSpecBuilder};
 use reth_db::tables;
 use reth_db_api::{
@@ -8,8 +9,8 @@ use reth_db_api::{
     transaction::{DbTx, DbTxMut},
 };
 use reth_primitives::{
-    keccak256, Account as RethAccount, Address, Bloom, Bytecode, Bytes, Header as RethHeader,
+    keccak256, Account as RethAccount, Bytecode, Header as RethHeader, SealedHeader, StorageEntry,
-    SealedHeader, StorageEntry, Withdrawals, B256, B64, U256,
+    Withdrawals,
 };
 use serde::Deserialize;
 use std::{collections::BTreeMap, ops::Deref};

testing/testing-utils/Cargo.toml

@@ -16,6 +16,7 @@ reth-primitives = { workspace = true, features = ["secp256k1"] }
 
 alloy-eips.workspace = true
 alloy-genesis.workspace = true
+alloy-primitives.workspace = true
 
 rand.workspace = true
 secp256k1 = { workspace = true, features = ["rand"] }

testing/testing-utils/src/generators.rs

@@ -3,14 +3,14 @@
 use alloy_eips::{
     eip6110::DepositRequest, eip7002::WithdrawalRequest, eip7251::ConsolidationRequest,
 };
+use alloy_primitives::{Address, BlockNumber, Bytes, TxKind, B256, U256};
 pub use rand::Rng;
 use rand::{
     distributions::uniform::SampleRange, rngs::StdRng, seq::SliceRandom, thread_rng, SeedableRng,
 };
 use reth_primitives::{
-    proofs, sign_message, Account, Address, BlockNumber, Bytes, Header, Log, Receipt, Request,
+    proofs, sign_message, Account, Header, Log, Receipt, Request, Requests, SealedBlock,
-    Requests, SealedBlock, SealedHeader, StorageEntry, Transaction, TransactionSigned, TxKind,
+    SealedHeader, StorageEntry, Transaction, TransactionSigned, TxLegacy, Withdrawal, Withdrawals,
-    TxLegacy, Withdrawal, Withdrawals, B256, U256,
 };
 use secp256k1::{Keypair, Secp256k1};
 use std::{

testing/testing-utils/src/genesis_allocator.rs

@@ -2,7 +2,8 @@
 //! signers to the genesis block.
 
 use alloy_genesis::GenesisAccount;
-use reth_primitives::{public_key_to_address, Address, Bytes, B256, U256};
+use alloy_primitives::{Address, Bytes, B256, U256};
+use reth_primitives::public_key_to_address;
 use secp256k1::{
     rand::{thread_rng, RngCore},
     Keypair, Secp256k1,