Rename things (#226)

* Rename `enclave_node` -> `runtime` * Rename `runtime` -> `enclave_core` * Revert poor replace * Use workspace paths
gnosisguild · Dec 30, 2024 · 4c1e755 · 4c1e755
1 parent 2e8f195
commit 4c1e755
Show file tree

Hide file tree

Showing 82 changed files with 170 additions and 176 deletions.
diff --git a/packages/ciphernode/Cargo.lock b/packages/ciphernode/Cargo.lock
diff --git a/packages/ciphernode/Cargo.toml b/packages/ciphernode/Cargo.toml
@@ -1,8 +1,8 @@
 [workspace]
 members = [
-  "core",
+  "events",
   "enclave",
-  "enclave_node",
+  "enclave_core",
   "net",
   "bfv",
   "data",
@@ -14,7 +14,7 @@ members = [
   "test_helpers",
   "logger",
   "tests",
-  "cipher",
+  "crypto",
   "config",
 ]
 
@@ -36,13 +36,13 @@ bincode = "1.3.3"
 bs58 = "0.5.1"
 base64 = "0.22.1"
 clap = { version = "4.5.17", features = ["derive"] }
-cipher = { path = "./cipher" }
+crypto = { path = "./crypto" }
 compile-time = "0.2.0"
 config = { path = "./config" }
 dirs = "5.0.1"
 data = { path = "./data" }
-enclave-core = { path = "./core" }
-enclave_node = { path = "./enclave_node" }
+events = { path = "./events" }
+enclave_core = { path = "./enclave_core" }
 evm = { path = "./evm" }
 shellexpand = "3.1.0"
 figment = { version = "0.10.19", features = ["yaml", "test"] }

diff --git a/packages/ciphernode/aggregator/Cargo.toml b/packages/ciphernode/aggregator/Cargo.toml
@@ -10,7 +10,7 @@ serde = { workspace = true }
 bincode = { workspace = true }
 config = { workspace = true }
 async-trait = { workspace = true }
-enclave-core = { path = "../core" }
+events = { workspace = true }
 fhe = { path = "../fhe" }
 sortition = { path = "../sortition" }
 e3_request = { workspace = true }

diff --git a/packages/ciphernode/aggregator/src/feature.rs b/packages/ciphernode/aggregator/src/feature.rs
@@ -8,7 +8,7 @@ use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use data::{AutoPersist, RepositoriesFactory};
 use e3_request::{E3Context, E3ContextSnapshot, E3Feature, META_KEY};
-use enclave_core::{BusError, EnclaveErrorType, EnclaveEvent, EventBus};
+use events::{BusError, EnclaveErrorType, EnclaveEvent, EventBus};
 use fhe::FHE_KEY;
 use sortition::Sortition;
 

diff --git a/packages/ciphernode/aggregator/src/plaintext_aggregator.rs b/packages/ciphernode/aggregator/src/plaintext_aggregator.rs
@@ -1,7 +1,7 @@
 use actix::prelude::*;
 use anyhow::Result;
 use data::Persistable;
-use enclave_core::{
+use events::{
     DecryptionshareCreated, Die, E3id, EnclaveEvent, EventBus, OrderedSet, PlaintextAggregated,
     Seed,
 };

diff --git a/packages/ciphernode/aggregator/src/publickey_aggregator.rs b/packages/ciphernode/aggregator/src/publickey_aggregator.rs
@@ -1,7 +1,7 @@
 use actix::prelude::*;
 use anyhow::Result;
 use data::Persistable;
-use enclave_core::{
+use events::{
     Die, E3id, EnclaveEvent, EventBus, KeyshareCreated, OrderedSet, PublicKeyAggregated, Seed,
 };
 use fhe::{Fhe, GetAggregatePublicKey};

diff --git a/packages/ciphernode/aggregator/src/repo.rs b/packages/ciphernode/aggregator/src/repo.rs
@@ -1,6 +1,6 @@
 use config::StoreKeys;
 use data::{Repositories, Repository};
-use enclave_core::E3id;
+use events::E3id;
 
 use crate::{PlaintextAggregatorState, PublicKeyAggregatorState};
 

diff --git a/packages/ciphernode/config/Cargo.toml b/packages/ciphernode/config/Cargo.toml
@@ -11,7 +11,7 @@ figment = { workspace = true }
 alloy = { workspace = true }
 shellexpand = { workspace = true }
 url = { workspace = true }
-enclave-core = { workspace = true }
+events = { workspace = true }
 
 [dev-dependencies]
 tempfile = { workspace = true }

diff --git a/packages/ciphernode/config/src/store_keys.rs b/packages/ciphernode/config/src/store_keys.rs
@@ -1,4 +1,4 @@
-use enclave_core::E3id;
+use events::E3id;
 
 pub struct StoreKeys;
 

diff --git a/packages/ciphernode/cipher/Cargo.toml → packages/ciphernode/crypto/Cargo.toml b/packages/ciphernode/cipher/Cargo.toml → packages/ciphernode/crypto/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "cipher"
+name = "crypto"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/packages/ciphernode/cipher/src/cipher.rs → packages/ciphernode/crypto/src/cipher.rs b/packages/ciphernode/cipher/src/cipher.rs → packages/ciphernode/crypto/src/cipher.rs
diff --git a/packages/ciphernode/cipher/src/lib.rs → packages/ciphernode/crypto/src/lib.rs b/packages/ciphernode/cipher/src/lib.rs → packages/ciphernode/crypto/src/lib.rs
diff --git a/...ciphernode/cipher/src/password_manager.rs → ...ciphernode/crypto/src/password_manager.rs b/...ciphernode/cipher/src/password_manager.rs → ...ciphernode/crypto/src/password_manager.rs
diff --git a/packages/ciphernode/data/Cargo.toml b/packages/ciphernode/data/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/gnosisguild/enclave/packages/ciphernode"
 
 [dependencies]
 actix = { workspace = true }
-enclave-core = { path = "../core" }
+events = { workspace = true }
 anyhow = { workspace = true }
 serde = { workspace = true }
 sled = { workspace = true }