feat(txpool): replace testing pool with default eth pool (#1857)

This commit is contained in:
Matthias Seitz
2023-03-20 12:53:07 +01:00
committed by GitHub
parent 2a457c7023
commit 8673e95d0a
5 changed files with 58 additions and 28 deletions

View File

@ -16,7 +16,7 @@ reth-revm-inspectors = { path = "../../crates/revm/revm-inspectors" }
reth-staged-sync = { path = "../../crates/staged-sync" }
reth-stages = { path = "../../crates/stages"}
reth-interfaces = { path = "../../crates/interfaces", features = ["test-utils"] }
reth-transaction-pool = { path = "../../crates/transaction-pool", features = ["test-utils"] }
reth-transaction-pool = { path = "../../crates/transaction-pool" }
reth-beacon-consensus = { path = "../../crates/consensus/beacon" }
reth-executor = { path = "../../crates/executor" }
reth-rpc-engine-api = { path = "../../crates/rpc/rpc-engine-api" }

View File

@ -54,6 +54,7 @@ use reth_stages::{
stages::{ExecutionStage, HeaderSyncMode, SenderRecoveryStage, TotalDifficultyStage, FINISH},
};
use reth_tasks::TaskExecutor;
use reth_transaction_pool::EthTransactionValidator;
use std::{
net::{Ipv4Addr, SocketAddr, SocketAddrV4},
path::PathBuf,
@ -173,7 +174,7 @@ impl Command {
info!(target: "reth::cli", path = %self.db, "Opening database");
let db = Arc::new(init_db(&self.db)?);
let shareable_db = ShareableDatabase::new(Arc::clone(&db), self.chain.clone());
let shareable_db = ShareableDatabase::new(Arc::clone(&db), Arc::clone(&self.chain));
info!(target: "reth::cli", "Database opened");
self.start_metrics_endpoint()?;
@ -193,14 +194,17 @@ impl Command {
let network = self.start_network(network_config, &ctx.task_executor, ()).await?;
info!(target: "reth::cli", peer_id = %network.peer_id(), local_addr = %network.local_addr(), "Connected to P2P network");
let test_transaction_pool = reth_transaction_pool::test_utils::testing_pool();
let transaction_pool = reth_transaction_pool::Pool::eth_pool(
EthTransactionValidator::new(shareable_db.clone(), Arc::clone(&self.chain)),
Default::default(),
);
info!(target: "reth::cli", "Test transaction pool initialized");
let _rpc_server = self
.rpc
.start_rpc_server(
shareable_db.clone(),
test_transaction_pool.clone(),
transaction_pool.clone(),
network.clone(),
ctx.task_executor.clone(),
)
@ -220,7 +224,7 @@ impl Command {
.rpc
.start_auth_server(
shareable_db,
test_transaction_pool,
transaction_pool,
network.clone(),
ctx.task_executor.clone(),
engine_api_handle,