refactor: merge and rename crates

morph-dev · Jul 16, 2024 · 2f0954e · 2f0954e
1 parent 9b0fa10
commit 2f0954e
Show file tree

Hide file tree

Showing 58 changed files with 67 additions and 571 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -57,7 +57,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --all --all-targets --all-features --no-deps -- -D warnings
+          args: --workspace --all-targets --all-features --no-deps -- -D warnings
 
   build:
     name: Build Release

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,6 @@
 [workspace]
 members = [
-  "portal-bridge",
-  "portal-verkle-trie",
-  "verkle-core",
+  "portal-verkle",
+  "portal-verkle-bridge",
 ]
 resolver = "2"
diff --git a/portal-bridge/Cargo.toml → portal-verkle-bridge/Cargo.toml b/portal-bridge/Cargo.toml → portal-verkle-bridge/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "portal-bridge"
+name = "portal-verkle-bridge"
 version = "0.1.0"
 edition = "2021"
 description = "The binary for seeding the Verkle Trie State into Portal Network."

diff --git a/portal-bridge/src/beacon_block_fetcher.rs → ...verkle-bridge/src/beacon_block_fetcher.rs b/portal-bridge/src/beacon_block_fetcher.rs → ...verkle-bridge/src/beacon_block_fetcher.rs
diff --git a/portal-bridge/src/bin/fetch_beacon_blocks.rs → ...kle-bridge/src/bin/fetch_beacon_blocks.rs b/portal-bridge/src/bin/fetch_beacon_blocks.rs → ...kle-bridge/src/bin/fetch_beacon_blocks.rs
@@ -1,5 +1,5 @@
 use clap::Parser;
-use portal_bridge::beacon_block_fetcher::BeaconBlockFetcher;
+use portal_verkle_bridge::beacon_block_fetcher::BeaconBlockFetcher;
 
 const LOCALHOST_RPC_URL: &str = "http://localhost:9596/";
 

diff --git a/...bridge/src/bin/fetch_state_from_portal.rs → ...bridge/src/bin/fetch_state_from_portal.rs b/...bridge/src/bin/fetch_state_from_portal.rs → ...bridge/src/bin/fetch_state_from_portal.rs
@@ -1,6 +1,6 @@
 use anyhow::bail;
 use clap::Parser;
-use portal_bridge::{
+use portal_verkle_bridge::{
     beacon_block_fetcher::BeaconBlockFetcher, state_trie_fetcher::StateTrieFetcher,
     types::genesis::GenesisConfig,
 };

diff --git a/portal-bridge/src/bin/gossip_to_portal.rs → ...verkle-bridge/src/bin/gossip_to_portal.rs b/portal-bridge/src/bin/gossip_to_portal.rs → ...verkle-bridge/src/bin/gossip_to_portal.rs
@@ -10,7 +10,7 @@ use ethportal_api::{
     VerkleNetworkApiClient,
 };
 use jsonrpsee::http_client::{HttpClient, HttpClientBuilder};
-use portal_bridge::{
+use portal_verkle_bridge::{
     beacon_block_fetcher::BeaconBlockFetcher,
     evm::VerkleEvm,
     types::{genesis::GenesisConfig, state_write::StateWrites},

diff --git a/portal-bridge/src/evm/error.rs → portal-verkle-bridge/src/evm/error.rs b/portal-bridge/src/evm/error.rs → portal-verkle-bridge/src/evm/error.rs
diff --git a/portal-bridge/src/evm/mod.rs → portal-verkle-bridge/src/evm/mod.rs b/portal-bridge/src/evm/mod.rs → portal-verkle-bridge/src/evm/mod.rs
diff --git a/portal-bridge/src/evm/verkle_evm.rs → portal-verkle-bridge/src/evm/verkle_evm.rs b/portal-bridge/src/evm/verkle_evm.rs → portal-verkle-bridge/src/evm/verkle_evm.rs
diff --git a/portal-bridge/src/lib.rs → portal-verkle-bridge/src/lib.rs b/portal-bridge/src/lib.rs → portal-verkle-bridge/src/lib.rs
diff --git a/portal-bridge/src/paths.rs → portal-verkle-bridge/src/paths.rs b/portal-bridge/src/paths.rs → portal-verkle-bridge/src/paths.rs
diff --git a/portal-bridge/src/state_trie_fetcher.rs → ...l-verkle-bridge/src/state_trie_fetcher.rs b/portal-bridge/src/state_trie_fetcher.rs → ...l-verkle-bridge/src/state_trie_fetcher.rs
diff --git a/portal-bridge/src/types/beacon.rs → portal-verkle-bridge/src/types/beacon.rs b/portal-bridge/src/types/beacon.rs → portal-verkle-bridge/src/types/beacon.rs
diff --git a/portal-bridge/src/types/genesis.rs → portal-verkle-bridge/src/types/genesis.rs b/portal-bridge/src/types/genesis.rs → portal-verkle-bridge/src/types/genesis.rs
diff --git a/portal-bridge/src/types/mod.rs → portal-verkle-bridge/src/types/mod.rs b/portal-bridge/src/types/mod.rs → portal-verkle-bridge/src/types/mod.rs
diff --git a/portal-bridge/src/types/state_write.rs → ...al-verkle-bridge/src/types/state_write.rs b/portal-bridge/src/types/state_write.rs → ...al-verkle-bridge/src/types/state_write.rs
diff --git a/portal-bridge/src/types/witness.rs → portal-verkle-bridge/src/types/witness.rs b/portal-bridge/src/types/witness.rs → portal-verkle-bridge/src/types/witness.rs
diff --git a/portal-bridge/src/utils.rs → portal-verkle-bridge/src/utils.rs b/portal-bridge/src/utils.rs → portal-verkle-bridge/src/utils.rs
diff --git a/portal-bridge/src/verkle_trie/error.rs → ...al-verkle-bridge/src/verkle_trie/error.rs b/portal-bridge/src/verkle_trie/error.rs → ...al-verkle-bridge/src/verkle_trie/error.rs
diff --git a/portal-bridge/src/verkle_trie/mod.rs → portal-verkle-bridge/src/verkle_trie/mod.rs b/portal-bridge/src/verkle_trie/mod.rs → portal-verkle-bridge/src/verkle_trie/mod.rs
diff --git a/...al-bridge/src/verkle_trie/nodes/branch.rs → ...le-bridge/src/verkle_trie/nodes/branch.rs b/...al-bridge/src/verkle_trie/nodes/branch.rs → ...le-bridge/src/verkle_trie/nodes/branch.rs
diff --git a/...ridge/src/verkle_trie/nodes/commitment.rs → ...ridge/src/verkle_trie/nodes/commitment.rs b/...ridge/src/verkle_trie/nodes/commitment.rs → ...ridge/src/verkle_trie/nodes/commitment.rs
diff --git a/portal-bridge/src/verkle_trie/nodes/leaf.rs → ...rkle-bridge/src/verkle_trie/nodes/leaf.rs b/portal-bridge/src/verkle_trie/nodes/leaf.rs → ...rkle-bridge/src/verkle_trie/nodes/leaf.rs
diff --git a/portal-bridge/src/verkle_trie/nodes/mod.rs → ...erkle-bridge/src/verkle_trie/nodes/mod.rs b/portal-bridge/src/verkle_trie/nodes/mod.rs → ...erkle-bridge/src/verkle_trie/nodes/mod.rs
diff --git a/portal-bridge/src/verkle_trie/trie.rs → portal-verkle-bridge/src/verkle_trie/trie.rs b/portal-bridge/src/verkle_trie/trie.rs → portal-verkle-bridge/src/verkle_trie/trie.rs
diff --git a/...al-bridge/src/verkle_trie/trie_printer.rs → ...le-bridge/src/verkle_trie/trie_printer.rs b/...al-bridge/src/verkle_trie/trie_printer.rs → ...le-bridge/src/verkle_trie/trie_printer.rs
diff --git a/...bridge/testdata/beacon.block.15.test.json → ...bridge/testdata/beacon.block.15.test.json b/...bridge/testdata/beacon.block.15.test.json → ...bridge/testdata/beacon.block.15.test.json
diff --git a/...dge/testdata/beacon.block.32100.test.json → ...dge/testdata/beacon.block.32100.test.json b/...dge/testdata/beacon.block.32100.test.json → ...dge/testdata/beacon.block.32100.test.json
diff --git a/...ridge/testdata/beacon.block.453.test.json → ...ridge/testdata/beacon.block.453.test.json b/...ridge/testdata/beacon.block.453.test.json → ...ridge/testdata/beacon.block.453.test.json
diff --git a/portal-verkle-trie/Cargo.toml b/portal-verkle-trie/Cargo.toml
diff --git a/portal-verkle-trie/src/lib.rs b/portal-verkle-trie/src/lib.rs
diff --git a/portal-verkle-trie/src/nodes/branch.rs b/portal-verkle-trie/src/nodes/branch.rs