refactor: move crate ethportal-peertest to `testing/ethportal-peert…

…est`
ethereum · Jan 13, 2025 · c833ddd · c833ddd
1 parent dbdf060
commit c833ddd
Show file tree

Hide file tree

Showing 21 changed files with 31 additions and 25 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -6,7 +6,6 @@
 !Cargo.toml
 !/bin
 !/crates
-!/ethportal-peertest
 !/portal-bridge
 !/testing
 !/trin-execution

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,9 +13,9 @@ members = [
     "crates/subnetworks/state",
     "crates/utils",
     "crates/validation",    
-    "ethportal-peertest",
     "portal-bridge",
     "testing/ef-tests",
+    "testing/ethportal-peertest",
     "trin-execution",
     "utp-testing",
 ]

diff --git a/ethportal-peertest/Cargo.toml → testing/ethportal-peertest/Cargo.toml b/ethportal-peertest/Cargo.toml → testing/ethportal-peertest/Cargo.toml
@@ -44,3 +44,6 @@ url.workspace = true
 
 [target.'cfg(windows)'.dependencies]
 uds_windows.workspace = true
+
+[dev-dependencies]
+serial_test.workspace = true
diff --git a/ethportal-peertest/README.md → testing/ethportal-peertest/README.md b/ethportal-peertest/README.md → testing/ethportal-peertest/README.md
diff --git a/ethportal-peertest/src/lib.rs → testing/ethportal-peertest/src/lib.rs b/ethportal-peertest/src/lib.rs → testing/ethportal-peertest/src/lib.rs
diff --git a/ethportal-peertest/src/scenarios/basic.rs → ...ethportal-peertest/src/scenarios/basic.rs b/ethportal-peertest/src/scenarios/basic.rs → ...ethportal-peertest/src/scenarios/basic.rs
diff --git a/ethportal-peertest/src/scenarios/bridge.rs → ...thportal-peertest/src/scenarios/bridge.rs b/ethportal-peertest/src/scenarios/bridge.rs → ...thportal-peertest/src/scenarios/bridge.rs
@@ -22,7 +22,7 @@ use crate::{
 pub async fn test_history_bridge(peertest: &Peertest, portal_client: &HttpClient) {
     let header_oracle = HeaderOracle::default();
     let epoch_acc_path = "validation_assets/epoch_acc.bin".into();
-    let mode = BridgeMode::Test("./test_assets/portalnet/bridge_data.json".into());
+    let mode = BridgeMode::Test("./../../test_assets/portalnet/bridge_data.json".into());
     // url doesn't matter, we're not making any requests
     let client_url = Url::parse("http://www.null.com").unwrap();
     let execution_api = ExecutionApi::new(
@@ -54,7 +54,7 @@ pub async fn test_history_bridge(peertest: &Peertest, portal_client: &HttpClient
 }
 
 pub async fn test_beacon_bridge(peertest: &Peertest, portal_client: &HttpClient) {
-    let mode = BridgeMode::Test("./test_assets/portalnet/beacon_bridge_data.yaml".into());
+    let mode = BridgeMode::Test("./../../test_assets/portalnet/beacon_bridge_data.yaml".into());
     // Wait for bootnode to start
     sleep(Duration::from_secs(1)).await;
     // url doesn't matter, we're not making any requests
@@ -69,7 +69,7 @@ pub async fn test_beacon_bridge(peertest: &Peertest, portal_client: &HttpClient)
     let bridge = BeaconBridge::new(consensus_api, mode, portal_client.clone());
     bridge.launch().await;
 
-    let value = std::fs::read_to_string("./test_assets/portalnet/beacon_bridge_data.yaml")
+    let value = std::fs::read_to_string("./../../test_assets/portalnet/beacon_bridge_data.yaml")
         .expect("cannot find test asset");
     let value: Value = serde_yaml::from_str(&value).unwrap();
     let content_key = BeaconContentKey::deserialize(&value[0]["content_key"]).unwrap();

diff --git a/ethportal-peertest/src/scenarios/eth_rpc.rs → ...hportal-peertest/src/scenarios/eth_rpc.rs b/ethportal-peertest/src/scenarios/eth_rpc.rs → ...hportal-peertest/src/scenarios/eth_rpc.rs
diff --git a/ethportal-peertest/src/scenarios/find.rs → .../ethportal-peertest/src/scenarios/find.rs b/ethportal-peertest/src/scenarios/find.rs → .../ethportal-peertest/src/scenarios/find.rs
diff --git a/ethportal-peertest/src/scenarios/mod.rs → ...g/ethportal-peertest/src/scenarios/mod.rs b/ethportal-peertest/src/scenarios/mod.rs → ...g/ethportal-peertest/src/scenarios/mod.rs
diff --git a/...al-peertest/src/scenarios/offer_accept.rs → ...al-peertest/src/scenarios/offer_accept.rs b/...al-peertest/src/scenarios/offer_accept.rs → ...al-peertest/src/scenarios/offer_accept.rs
diff --git a/ethportal-peertest/src/scenarios/paginate.rs → ...portal-peertest/src/scenarios/paginate.rs b/ethportal-peertest/src/scenarios/paginate.rs → ...portal-peertest/src/scenarios/paginate.rs
diff --git a/...tal-peertest/src/scenarios/put_content.rs → ...tal-peertest/src/scenarios/put_content.rs b/...tal-peertest/src/scenarios/put_content.rs → ...tal-peertest/src/scenarios/put_content.rs
diff --git a/ethportal-peertest/src/scenarios/state.rs → ...ethportal-peertest/src/scenarios/state.rs b/ethportal-peertest/src/scenarios/state.rs → ...ethportal-peertest/src/scenarios/state.rs
diff --git a/ethportal-peertest/src/scenarios/utp.rs → ...g/ethportal-peertest/src/scenarios/utp.rs b/ethportal-peertest/src/scenarios/utp.rs → ...g/ethportal-peertest/src/scenarios/utp.rs
diff --git a/...rtal-peertest/src/scenarios/validation.rs → ...rtal-peertest/src/scenarios/validation.rs b/...rtal-peertest/src/scenarios/validation.rs → ...rtal-peertest/src/scenarios/validation.rs
diff --git a/ethportal-peertest/src/utils.rs → testing/ethportal-peertest/src/utils.rs b/ethportal-peertest/src/utils.rs → testing/ethportal-peertest/src/utils.rs
@@ -116,20 +116,21 @@ fn read_fixture(file_name: &str) -> (HistoryContentKey, HistoryContentValue) {
 /// History HeaderWithProof content key & value
 /// Block #1000010
 pub fn fixture_header_by_hash_1000010() -> (HistoryContentKey, HistoryContentValue) {
-    read_fixture("portal-spec-tests/tests/mainnet/history/headers_with_proof/1000010.yaml")
+    read_fixture("../../portal-spec-tests/tests/mainnet/history/headers_with_proof/1000010.yaml")
 }
 
 /// History HeaderByHash content key & value
 /// Block #14764013 (pre-merge)
 pub fn fixture_header_by_hash() -> (HistoryContentKey, HistoryContentValue) {
-    read_fixture("portal-spec-tests/tests/mainnet/history/headers_with_proof/14764013.yaml")
+    read_fixture("../../portal-spec-tests/tests/mainnet/history/headers_with_proof/14764013.yaml")
 }
 
 /// History HeaderByNumber content key & value
 /// Block #14764013 (pre-merge)
 pub fn fixture_header_by_number() -> (HistoryContentKey, HistoryContentValue) {
-    let (_, content_value) =
-        read_fixture("portal-spec-tests/tests/mainnet/history/headers_with_proof/14764013.yaml");
+    let (_, content_value) = read_fixture(
+        "../../portal-spec-tests/tests/mainnet/history/headers_with_proof/14764013.yaml",
+    );
 
     // Create a content key from the block number
     let HistoryContentValue::BlockHeaderWithProof(header_with_proof) = content_value.clone() else {
@@ -144,13 +145,13 @@ pub fn fixture_header_by_number() -> (HistoryContentKey, HistoryContentValue) {
 /// History BlockBody content key & value
 /// Block #14764013 (pre-merge)
 pub fn fixture_block_body() -> (HistoryContentKey, HistoryContentValue) {
-    read_fixture("portal-spec-tests/tests/mainnet/history/bodies/14764013.yaml")
+    read_fixture("../../portal-spec-tests/tests/mainnet/history/bodies/14764013.yaml")
 }
 
 /// History Receipts content key & value
 /// Block #14764013 (pre-merge)
 pub fn fixture_receipts() -> (HistoryContentKey, HistoryContentValue) {
-    read_fixture("portal-spec-tests/tests/mainnet/history/receipts/14764013.yaml")
+    read_fixture("../../portal-spec-tests/tests/mainnet/history/receipts/14764013.yaml")
 }
 
 enum DependentType {
@@ -208,7 +209,7 @@ fn read_binary_history_fixture(
     dependent: Option<DependentType>,
 ) -> (HistoryContentKey, HistoryContentValue) {
     let header_value = std::fs::read(format!(
-        "test_assets/mainnet/large_content/{block_number}/header.bin"
+        "../../test_assets/mainnet/large_content/{block_number}/header.bin"
     ))
     .unwrap();
     let header_content_value: HeaderWithProof =
@@ -217,7 +218,7 @@ fn read_binary_history_fixture(
     match dependent {
         Some(dependent_type) => {
             let dependent_value = std::fs::read(format!(
-                "test_assets/mainnet/large_content/{block_number}/{dependent_type}.bin"
+                "../../test_assets/mainnet/large_content/{block_number}/{dependent_type}.bin"
             ))
             .unwrap();
             match dependent_type {
@@ -296,15 +297,19 @@ fn read_state_fixture(file_name: &str) -> Vec<StateFixture> {
 }
 
 pub fn fixtures_state_account_trie_node() -> Vec<StateFixture> {
-    read_state_fixture("portal-spec-tests/tests/mainnet/state/validation/account_trie_node.yaml")
+    read_state_fixture(
+        "../../portal-spec-tests/tests/mainnet/state/validation/account_trie_node.yaml",
+    )
 }
 
 pub fn fixtures_state_contract_storage_trie_node() -> Vec<StateFixture> {
     read_state_fixture(
-        "portal-spec-tests/tests/mainnet/state/validation/contract_storage_trie_node.yaml",
+        "../../portal-spec-tests/tests/mainnet/state/validation/contract_storage_trie_node.yaml",
     )
 }
 
 pub fn fixtures_state_contract_bytecode() -> Vec<StateFixture> {
-    read_state_fixture("portal-spec-tests/tests/mainnet/state/validation/contract_bytecode.yaml")
+    read_state_fixture(
+        "../../portal-spec-tests/tests/mainnet/state/validation/contract_bytecode.yaml",
+    )
 }
diff --git a/tests/rpc_server.rs → ...ng/ethportal-peertest/tests/rpc_server.rs b/tests/rpc_server.rs → ...ng/ethportal-peertest/tests/rpc_server.rs
@@ -11,20 +11,19 @@ use alloy::{
     transports::RpcError,
 };
 use ethportal_api::{
-    types::{
-        cli::{TrinConfig, DEFAULT_WEB3_IPC_PATH},
-        execution::{block_body::BlockBody, header_with_proof::HeaderWithProof},
-    },
+    types::execution::{block_body::BlockBody, header_with_proof::HeaderWithProof},
     utils::bytes::{hex_decode, hex_encode},
     ContentValue, Header, HistoryContentKey, HistoryContentValue, HistoryNetworkApiClient,
 };
 use jsonrpsee::async_client::Client;
+use portalnet::constants::DEFAULT_WEB3_IPC_PATH;
 use rpc::RpcServerHandle;
 use serde_yaml::Value;
 use serial_test::serial;
 use ssz::Decode;
 
 mod utils;
+use trin::cli::TrinConfig;
 use utils::init_tracing;
 
 async fn setup_web3_server() -> (RpcServerHandle, RootProvider<PubSubFrontend>, Client) {
@@ -313,7 +312,7 @@ fn assert_header(actual: &RpcHeader, expected: &Header) {
 }
 
 fn get_full_block() -> (HeaderWithProof, BlockBody) {
-    let file = fs::read_to_string("crates/validation/src/assets/hive/blocks.yaml").unwrap();
+    let file = fs::read_to_string("../../crates/validation/src/assets/hive/blocks.yaml").unwrap();
     let value: Value = serde_yaml::from_str(&file).unwrap();
     let all_blocks = value.as_sequence().unwrap();
     let post_shanghai = all_blocks.last().unwrap();

diff --git a/tests/self_peertest.rs → ...ethportal-peertest/tests/self_peertest.rs b/tests/self_peertest.rs → ...ethportal-peertest/tests/self_peertest.rs
@@ -4,16 +4,15 @@ use std::{
     net::{IpAddr, Ipv4Addr},
 };
 
-use ethportal_api::types::{
-    cli::{TrinConfig, DEFAULT_WEB3_HTTP_ADDRESS, DEFAULT_WEB3_IPC_PATH},
-    network::{Network, Subnetwork},
-};
+use ethportal_api::types::network::{Network, Subnetwork};
 use ethportal_peertest as peertest;
 use ethportal_peertest::Peertest;
 use jsonrpsee::{async_client::Client, http_client::HttpClient};
+use portalnet::constants::{DEFAULT_WEB3_HTTP_ADDRESS, DEFAULT_WEB3_IPC_PATH};
 use rpc::RpcServerHandle;
 use serial_test::serial;
 use tokio::time::{sleep, Duration};
+use trin::cli::TrinConfig;
 
 mod utils;
 

diff --git a/tests/utils/mod.rs → ...ing/ethportal-peertest/tests/utils/mod.rs b/tests/utils/mod.rs → ...ing/ethportal-peertest/tests/utils/mod.rs