Skip to content

Commit

Permalink
Checkout EthApiTypes::NetworkTypes from emhane/ethapi-types
Browse files Browse the repository at this point in the history
  • Loading branch information
emhane committed Aug 21, 2024
1 parent ae8ce20 commit a0a2f35
Show file tree
Hide file tree
Showing 43 changed files with 477 additions and 275 deletions.
126 changes: 57 additions & 69 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,7 @@ alloy-transport-ws = { version = "0.2.1", default-features = false }

# op
op-alloy-rpc-types = "0.1"
op-alloy-network = "0.1"

# misc
aquamarine = "0.5"
Expand Down
4 changes: 4 additions & 0 deletions crates/e2e-test-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ reth-tokio-util.workspace = true
reth-stages-types.workspace = true
reth-network-peers.workspace = true
reth-node-ethereum.workspace = true
reth-rpc-types.workspace = true
reth-rpc-types-compat.workspace = true

# rpc
jsonrpsee-types.workspace = true
jsonrpsee.workspace = true

futures-util.workspace = true
Expand Down
16 changes: 13 additions & 3 deletions crates/e2e-test-utils/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
use std::sync::Arc;

use alloy_network::Network;
use node::NodeTestContext;
use reth::{
args::{DiscoveryArgs, NetworkArgs, RpcServerArgs},
Expand Down Expand Up @@ -51,9 +52,18 @@ pub async fn setup<N>(
) -> eyre::Result<(Vec<NodeHelperType<N, N::AddOns>>, TaskManager, Wallet)>
where
N: Default + Node<TmpNodeAdapter<N>>,
<<N::ComponentsBuilder as NodeComponentsBuilder<TmpNodeAdapter<N>>>::Components as NodeComponents<TmpNodeAdapter<N>>>::Network: PeersHandleProvider,
<N::AddOns as NodeAddOns<Adapter<N>>>::EthApi:
FullEthApiServer + AddDevSigners + EthApiBuilderProvider<Adapter<N>>,

N::ComponentsBuilder: NodeComponentsBuilder<
TmpNodeAdapter<N>,
Components: NodeComponents<TmpNodeAdapter<N>, Network: PeersHandleProvider>,
>,
N::AddOns: NodeAddOns<
Adapter<N>,
EthApi: FullEthApiServer<
NetworkTypes: Network<TransactionResponse = reth_rpc_types::Transaction>,
> + AddDevSigners
+ EthApiBuilderProvider<Adapter<N>>,
>,
{
let tasks = TaskManager::current();
let exec = tasks.executor();
Expand Down
Loading

0 comments on commit a0a2f35

Please sign in to comment.