refactor: move crate portal-bridge to bin/portal-bridge

ethereum · Jan 14, 2025 · 61c2781 · 61c2781
1 parent 80ddc06
commit 61c2781
Show file tree

Hide file tree

Showing 29 changed files with 17 additions and 16 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -6,7 +6,6 @@
 !Cargo.toml
 !/bin
 !/crates
-!/portal-bridge
 !/testing
 !/trin-execution
 !/utp-testing

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,6 @@
 [workspace]
 members = [
+    "bin/portal-bridge",
     "bin/trin", 
     "crates/ethportal-api",
     "crates/e2store",
@@ -13,7 +14,6 @@ members = [
     "crates/subnetworks/state",
     "crates/utils",
     "crates/validation",    
-    "portal-bridge",
     "testing/ef-tests",
     "testing/ethportal-peertest",
     "trin-execution",
@@ -100,7 +100,7 @@ utp-rs = { tag = "v0.1.0-alpha.14", git = "https://github.com/ethereum/utp" }
 e2store = { path = "crates/e2store" }
 ethportal-api = { path = "crates/ethportal-api" }
 light-client = { path = "crates/light-client" }
-portal-bridge = { path = "portal-bridge" }
+portal-bridge = { path = "bin/portal-bridge" }
 portalnet = { path = "crates/portalnet" }
 rpc = { path = "crates/rpc"}
 trin = { path = "bin/trin"}

diff --git a/portal-bridge/Cargo.toml → bin/portal-bridge/Cargo.toml b/portal-bridge/Cargo.toml → bin/portal-bridge/Cargo.toml
diff --git a/portal-bridge/README.md → bin/portal-bridge/README.md b/portal-bridge/README.md → bin/portal-bridge/README.md
diff --git a/portal-bridge/src/api/consensus.rs → bin/portal-bridge/src/api/consensus.rs b/portal-bridge/src/api/consensus.rs → bin/portal-bridge/src/api/consensus.rs
diff --git a/portal-bridge/src/api/execution.rs → bin/portal-bridge/src/api/execution.rs b/portal-bridge/src/api/execution.rs → bin/portal-bridge/src/api/execution.rs
diff --git a/portal-bridge/src/api/mod.rs → bin/portal-bridge/src/api/mod.rs b/portal-bridge/src/api/mod.rs → bin/portal-bridge/src/api/mod.rs
diff --git a/portal-bridge/src/bridge/beacon.rs → bin/portal-bridge/src/bridge/beacon.rs b/portal-bridge/src/bridge/beacon.rs → bin/portal-bridge/src/bridge/beacon.rs
diff --git a/portal-bridge/src/bridge/era1.rs → bin/portal-bridge/src/bridge/era1.rs b/portal-bridge/src/bridge/era1.rs → bin/portal-bridge/src/bridge/era1.rs
diff --git a/portal-bridge/src/bridge/history.rs → bin/portal-bridge/src/bridge/history.rs b/portal-bridge/src/bridge/history.rs → bin/portal-bridge/src/bridge/history.rs
diff --git a/portal-bridge/src/bridge/mod.rs → bin/portal-bridge/src/bridge/mod.rs b/portal-bridge/src/bridge/mod.rs → bin/portal-bridge/src/bridge/mod.rs
diff --git a/portal-bridge/src/bridge/state.rs → bin/portal-bridge/src/bridge/state.rs b/portal-bridge/src/bridge/state.rs → bin/portal-bridge/src/bridge/state.rs
diff --git a/portal-bridge/src/bridge/utils.rs → bin/portal-bridge/src/bridge/utils.rs b/portal-bridge/src/bridge/utils.rs → bin/portal-bridge/src/bridge/utils.rs
diff --git a/portal-bridge/src/census/mod.rs → bin/portal-bridge/src/census/mod.rs b/portal-bridge/src/census/mod.rs → bin/portal-bridge/src/census/mod.rs
diff --git a/portal-bridge/src/census/network.rs → bin/portal-bridge/src/census/network.rs b/portal-bridge/src/census/network.rs → bin/portal-bridge/src/census/network.rs
diff --git a/portal-bridge/src/census/peer.rs → bin/portal-bridge/src/census/peer.rs b/portal-bridge/src/census/peer.rs → bin/portal-bridge/src/census/peer.rs
diff --git a/portal-bridge/src/census/peers.rs → bin/portal-bridge/src/census/peers.rs b/portal-bridge/src/census/peers.rs → bin/portal-bridge/src/census/peers.rs
diff --git a/portal-bridge/src/census/scoring.rs → bin/portal-bridge/src/census/scoring.rs b/portal-bridge/src/census/scoring.rs → bin/portal-bridge/src/census/scoring.rs
diff --git a/portal-bridge/src/cli.rs → bin/portal-bridge/src/cli.rs b/portal-bridge/src/cli.rs → bin/portal-bridge/src/cli.rs
diff --git a/portal-bridge/src/constants.rs → bin/portal-bridge/src/constants.rs b/portal-bridge/src/constants.rs → bin/portal-bridge/src/constants.rs
diff --git a/portal-bridge/src/handle.rs → bin/portal-bridge/src/handle.rs b/portal-bridge/src/handle.rs → bin/portal-bridge/src/handle.rs
diff --git a/portal-bridge/src/lib.rs → bin/portal-bridge/src/lib.rs b/portal-bridge/src/lib.rs → bin/portal-bridge/src/lib.rs
diff --git a/portal-bridge/src/main.rs → bin/portal-bridge/src/main.rs b/portal-bridge/src/main.rs → bin/portal-bridge/src/main.rs
diff --git a/portal-bridge/src/put_content.rs → bin/portal-bridge/src/put_content.rs b/portal-bridge/src/put_content.rs → bin/portal-bridge/src/put_content.rs
diff --git a/portal-bridge/src/stats.rs → bin/portal-bridge/src/stats.rs b/portal-bridge/src/stats.rs → bin/portal-bridge/src/stats.rs
diff --git a/portal-bridge/src/types/full_header.rs → bin/portal-bridge/src/types/full_header.rs b/portal-bridge/src/types/full_header.rs → bin/portal-bridge/src/types/full_header.rs
@@ -122,7 +122,7 @@ mod tests {
     #[test]
     fn full_header_from_get_block_response() {
         let body =
-            std::fs::read_to_string("../test_assets/mainnet/block_14764013_value.json").unwrap();
+            std::fs::read_to_string("../../test_assets/mainnet/block_14764013_value.json").unwrap();
         let body: Value = serde_json::from_str(&body).unwrap();
         let full_header = FullHeader::try_from(body["result"].clone()).unwrap();
         let header: Header = serde_json::from_value(body["result"].clone()).unwrap();
@@ -135,7 +135,7 @@ mod tests {
     #[test]
     fn full_header_with_withdrawals() {
         let body =
-            std::fs::read_to_string("../test_assets/mainnet/block_17034871_value.json").unwrap();
+            std::fs::read_to_string("../../test_assets/mainnet/block_17034871_value.json").unwrap();
         let body: Value = serde_json::from_str(&body).unwrap();
         let full_header = FullHeader::try_from(body["result"].clone()).unwrap();
         let block_body = BlockBody::Shanghai(BlockBodyShanghai {
@@ -149,7 +149,7 @@ mod tests {
     #[test]
     fn full_header_with_empty_withdrawals() {
         let body =
-            std::fs::read_to_string("../test_assets/mainnet/block_17034873_value.json").unwrap();
+            std::fs::read_to_string("../../test_assets/mainnet/block_17034873_value.json").unwrap();
         let body: Value = serde_json::from_str(&body).unwrap();
         let full_header = FullHeader::try_from(body["result"].clone()).unwrap();
         let block_body = BlockBody::Shanghai(BlockBodyShanghai {
@@ -167,7 +167,7 @@ mod tests {
     #[case("19433903")]
     fn full_header_block_body_dencun(#[case] case: &str) {
         let body =
-            std::fs::read_to_string(format!("../test_assets/mainnet/block_{case}_value.json"))
+            std::fs::read_to_string(format!("../../test_assets/mainnet/block_{case}_value.json"))
                 .unwrap();
         let body: Value = serde_json::from_str(&body).unwrap();
         let full_header = FullHeader::try_from(body["result"].clone()).unwrap();
@@ -188,7 +188,7 @@ mod tests {
         // this block (15573637) was chosen since it contains all tx types (legacy, access list,
         // eip1559) as well as contract creation txs
         let expected: String =
-            std::fs::read_to_string("../test_assets/geth_batch/headers.json").unwrap();
+            std::fs::read_to_string("../../test_assets/geth_batch/headers.json").unwrap();
         let full_headers: FullHeaderBatch = serde_json::from_str(&expected).unwrap();
         for full_header in full_headers.headers {
             let block_body = BlockBody::Legacy(BlockBodyLegacy {

diff --git a/portal-bridge/src/types/mod.rs → bin/portal-bridge/src/types/mod.rs b/portal-bridge/src/types/mod.rs → bin/portal-bridge/src/types/mod.rs
diff --git a/portal-bridge/src/types/mode.rs → bin/portal-bridge/src/types/mode.rs b/portal-bridge/src/types/mode.rs → bin/portal-bridge/src/types/mode.rs
diff --git a/portal-bridge/src/utils.rs → bin/portal-bridge/src/utils.rs b/portal-bridge/src/utils.rs → bin/portal-bridge/src/utils.rs
@@ -228,10 +228,11 @@ mod tests {
 
     #[test]
     fn test_read_test_assets_from_file_json() {
-        let assets: HistoryTestAssets =
-            read_test_assets_from_file(PathBuf::from("../test_assets/portalnet/bridge_data.json"))
-                .into_history_assets()
-                .unwrap();
+        let assets: HistoryTestAssets = read_test_assets_from_file(PathBuf::from(
+            "../../test_assets/portalnet/bridge_data.json",
+        ))
+        .into_history_assets()
+        .unwrap();
         let content_key =
             HistoryContentKey::deserialize(json!(HEADER_WITH_PROOF_CONTENT_KEY)).unwrap();
         let content_value =
@@ -243,10 +244,11 @@ mod tests {
 
     #[test]
     fn test_read_test_assets_from_file_yaml() {
-        let assets: HistoryTestAssets =
-            read_test_assets_from_file(PathBuf::from("../test_assets/portalnet/bridge_data.yaml"))
-                .into_history_assets()
-                .unwrap();
+        let assets: HistoryTestAssets = read_test_assets_from_file(PathBuf::from(
+            "../../test_assets/portalnet/bridge_data.yaml",
+        ))
+        .into_history_assets()
+        .unwrap();
         let content_key =
             HistoryContentKey::deserialize(json!(HEADER_WITH_PROOF_CONTENT_KEY)).unwrap();
         let content_value =