Skip to content

Commit

Permalink
chore(e2e-test-utils): replace reth_primitives with alloy_primitives (#…
Browse files Browse the repository at this point in the history
…10980)

Signed-off-by: Abhishekkochar <abhishekkochar2@gmail.com>
  • Loading branch information
Abhishekkochar authored Sep 18, 2024
1 parent c09391f commit 1fd4b1d
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions crates/e2e-test-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ reth-rpc-types-compat.workspace = true
jsonrpsee-types.workspace = true
jsonrpsee.workspace = true

# ethereum
alloy-primitives.workspace = true

futures-util.workspace = true
eyre.workspace = true
tokio.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/e2e-test-utils/src/engine_api.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use crate::traits::PayloadEnvelopeExt;
use alloy_primitives::B256;
use jsonrpsee::{
core::client::ClientT,
http_client::{transport::HttpBackend, HttpClient},
Expand All @@ -12,7 +13,6 @@ use reth::{
},
};
use reth_payload_builder::PayloadId;
use reth_primitives::B256;
use reth_rpc_layer::AuthClientService;
use std::marker::PhantomData;

Expand Down
2 changes: 1 addition & 1 deletion crates/e2e-test-utils/src/node.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::{marker::PhantomData, pin::Pin};

use alloy_network::Network;
use alloy_primitives::{BlockHash, BlockNumber, Bytes, B256};
use alloy_rpc_types::BlockNumberOrTag;
use eyre::Ok;
use futures_util::Future;
Expand All @@ -16,7 +17,6 @@ use reth::{
};
use reth_chainspec::ChainSpec;
use reth_node_builder::{EthApiTypes, NodeAddOns, NodeTypesWithEngine};
use reth_primitives::{BlockHash, BlockNumber, Bytes, B256};
use reth_rpc_types::WithOtherFields;
use reth_stages_types::StageId;
use tokio_stream::StreamExt;
Expand Down
2 changes: 1 addition & 1 deletion crates/e2e-test-utils/src/rpc.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use alloy_consensus::TxEnvelope;
use alloy_network::{eip2718::Decodable2718, Network};
use alloy_primitives::{Bytes, B256};
use reth::{
builder::{rpc::RpcRegistry, FullNodeComponents},
rpc::api::{
Expand All @@ -9,7 +10,6 @@ use reth::{
};
use reth_chainspec::ChainSpec;
use reth_node_builder::{EthApiTypes, NodeTypes};
use reth_primitives::{Bytes, B256};
use reth_rpc_types::{AnyTransactionReceipt, WithOtherFields};

#[allow(missing_debug_implementations)]
Expand Down
2 changes: 1 addition & 1 deletion crates/e2e-test-utils/src/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ use alloy_consensus::{
TxEnvelope,
};
use alloy_network::{eip2718::Encodable2718, Ethereum, EthereumWallet, TransactionBuilder};
use alloy_primitives::{hex, Address, Bytes, TxKind, B256, U256};
use alloy_rpc_types::{TransactionInput, TransactionRequest};
use alloy_signer_local::PrivateKeySigner;
use eyre::Ok;
use reth_primitives::{hex, Address, Bytes, TxKind, B256, U256};

/// Helper for transaction operations
#[derive(Debug)]
Expand Down

0 comments on commit 1fd4b1d

Please sign in to comment.