refactor: Removing actor pipes and naming (#213)

Getting rid of the whole actor pipe architecture. It was only created because we thought we would have many components, in reality we ended up with just two big components. This is just a refactor, no logic changes.
matter-labs · Nov 13, 2024 · 84bc7e4 · 84bc7e4
1 parent f4cc128
commit 84bc7e4
Show file tree

Hide file tree

Showing 109 changed files with 645 additions and 768 deletions.
diff --git a/node/Cargo.lock b/node/Cargo.lock
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -1,8 +1,8 @@
 [workspace]
 members = [
-    "actors/bft",
-    "actors/executor",
-    "actors/network",
+    "components/bft",
+    "components/executor",
+    "components/network",
     "libs/concurrency",
     "libs/crypto",
     "libs/protobuf",
@@ -26,10 +26,10 @@ version    = "0.5.0"
 
 [workspace.dependencies]
 # Crates from this repo.
-zksync_consensus_bft      = { version = "=0.5.0", path = "actors/bft" }
+zksync_consensus_bft      = { version = "=0.5.0", path = "components/bft" }
 zksync_consensus_crypto   = { version = "=0.5.0", path = "libs/crypto" }
-zksync_consensus_executor = { version = "=0.5.0", path = "actors/executor" }
-zksync_consensus_network  = { version = "=0.5.0", path = "actors/network" }
+zksync_consensus_executor = { version = "=0.5.0", path = "components/executor" }
+zksync_consensus_network  = { version = "=0.5.0", path = "components/network" }
 zksync_consensus_roles    = { version = "=0.5.0", path = "libs/roles" }
 zksync_consensus_storage  = { version = "=0.5.0", path = "libs/storage" }
 zksync_consensus_tools    = { version = "=0.5.0", path = "tools" }
@@ -73,8 +73,8 @@ hyper-util         = { version = "0.1", features = ["full"] }
 im                 = "15.1.0"
 jsonrpsee          = { version = "0.23.0", features = ["http-client", "server"] }
 k256               = { version = "0.13", features = ["ecdsa"] }
-k8s-openapi        = { version = "0.22.0", features = ["latest"] }
-kube               = { version = "0.91.0", features = ["derive", "runtime"] }
+k8s-openapi        = { version = "0.23.0", features = ["latest"] }
+kube               = { version = "0.96.0", features = ["derive", "runtime"] }
 num-bigint         = "0.4.4"
 num-traits         = "0.2.18"
 once_cell          = "1.17.1"

diff --git a/node/actors/bft/src/io.rs b/node/actors/bft/src/io.rs
diff --git a/node/actors/bft/src/lib.rs b/node/actors/bft/src/lib.rs
diff --git a/node/actors/executor/src/io.rs b/node/actors/executor/src/io.rs
diff --git a/node/actors/network/src/io.rs b/node/actors/network/src/io.rs
diff --git a/node/actors/network/src/state.rs b/node/actors/network/src/state.rs
diff --git a/node/actors/bft/Cargo.toml → node/components/bft/Cargo.toml b/node/actors/bft/Cargo.toml → node/components/bft/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors.workspace    = true
-description          = "ZKsync consensus bft actor"
+description          = "ZKsync consensus BFT component"
 edition.workspace    = true
 homepage.workspace   = true
 keywords.workspace   = true

diff --git a/node/actors/bft/src/chonky_bft/block.rs → node/components/bft/src/chonky_bft/block.rs b/node/actors/bft/src/chonky_bft/block.rs → node/components/bft/src/chonky_bft/block.rs
diff --git a/node/actors/bft/src/chonky_bft/commit.rs → node/components/bft/src/chonky_bft/commit.rs b/node/actors/bft/src/chonky_bft/commit.rs → node/components/bft/src/chonky_bft/commit.rs