Move cli to node (#253)

### Description  Move CLI & RPC crates to the `node` directory to clean up the root directory. ### Types of Changes  - [x] Tech Debt (Code improvements) - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Dependency upgrade (A change in substrate or any 3rd party crate version) ### Migrations and Hooks  - [ ] This change requires a runtime migration. - [ ] Modifies `on_initialize` - [ ] Modifies `on_finalize` ### Checklist  - [x] Change has been tested locally. - [ ] Change adds / updates tests. - [ ] Changelog doc updated.
Cerebellum-Network · Jan 31, 2024 · 5c21d10 · 5c21d10
1 parent 3dfb1c6
commit 5c21d10
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 44 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,27 +1,14 @@
-[[bin]]
-name = "cere"
-path = "src/main.rs"
-
-[package]
-name = "cere"
+[workspace.package]
 version = "4.8.8"
-build = "build.rs"
 edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
-[dependencies]
-cere-cli = { path = "cli", features = ["cere-dev-native"] }
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
-
-[build-dependencies]
-substrate-build-script-utils = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.40" }
-
 [workspace]
 members = [
-  "cli",
+  "node/cli",
   "node/client",
   "node/service",
-  "rpc",
+  "node/rpc",
   "runtime/cere",
   "runtime/cere-dev",
   "pallets/chainbridge",
@@ -33,10 +20,7 @@ members = [
   "pallets/ddc-clusters",
   "primitives",
 ]
+resolver = "2"
 
 [profile.release]
 panic = "unwind"
-
-[features]
-runtime-benchmarks = ["cere-cli/runtime-benchmarks"]
-try-runtime = ["cere-cli/try-runtime"]
diff --git a/build.rs b/build.rs
diff --git a/cli/Cargo.toml → node/cli/Cargo.toml b/cli/Cargo.toml → node/cli/Cargo.toml
@@ -11,6 +11,10 @@ wasm-opt = false
 [lib]
 crate-type = ["cdylib", "rlib"]
 
+[[bin]]
+name = "cere"
+path = "src/main.rs"
+
 [dependencies]
 clap = { version = "4.0.15", features = ["derive"], optional = true }
 frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.40" }
@@ -20,14 +24,14 @@ try-runtime-cli = { git = "https://github.com/paritytech/substrate", optional =
 url = "2.4.1"
 
 # Local
-cere-client = { path = "../node/client", optional = true }
-cere-service = { path = "../node/service", default-features = false, optional = true }
+cere-client = { path = "../client", optional = true }
+cere-service = { path = "../service", default-features = false, optional = true }
 
 [build-dependencies]
 substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
 
 [features]
-default = ["cli", "cere-native"]
+default = ["cli", "cere-dev-native"]
 cli = [
   "clap",
   "sc-cli",

diff --git a/cli/build.rs → node/cli/build.rs b/cli/build.rs → node/cli/build.rs
diff --git a/cli/src/cli.rs → node/cli/src/cli.rs b/cli/src/cli.rs → node/cli/src/cli.rs
diff --git a/cli/src/command.rs → node/cli/src/command.rs b/cli/src/command.rs → node/cli/src/command.rs
@@ -176,9 +176,9 @@ pub fn run() -> sc_cli::Result<()> {
 
 					#[cfg(not(feature = "cere-native"))]
 					#[allow(unreachable_code)]
-					Error::Service(ServiceError::Other(
+					Err(Error::Service(ServiceError::Other(
 						"No runtime feature (cere-native, cere-dev-native) is enabled".to_string(),
-					))
+					)))
 				},
 				BenchmarkCmd::Block(cmd) => runner.sync_run(|config| {
 					let (client, _, _, _) = cere_service::new_chain_ops(&config)?;

diff --git a/cli/src/lib.rs → node/cli/src/lib.rs b/cli/src/lib.rs → node/cli/src/lib.rs
diff --git a/src/main.rs → node/cli/src/main.rs b/src/main.rs → node/cli/src/main.rs
diff --git a/rpc/Cargo.toml → node/rpc/Cargo.toml b/rpc/Cargo.toml → node/rpc/Cargo.toml
diff --git a/rpc/src/lib.rs → node/rpc/src/lib.rs b/rpc/src/lib.rs → node/rpc/src/lib.rs
diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml
@@ -41,7 +41,7 @@ sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-
 
 # Local
 cere-client = { path = "../client", default-features = false, optional = true }
-cere-rpc = { path = "../../rpc" }
+cere-rpc = { path = "../rpc" }
 cere-runtime-common = { path = "../../runtime/common", optional = true }
 
 cere-dev-runtime = { path = "../../runtime/cere-dev", optional = true }

diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs
@@ -2,6 +2,9 @@
 
 use std::sync::Arc;
 
+#[cfg(not(any(feature = "cere-native", feature = "cere-dev-native",)))]
+compile_error!("at least one runtime feature must be enabled");
+
 #[cfg(feature = "cere-dev-native")]
 pub use cere_dev_runtime;
 #[cfg(feature = "cere-native")]
@@ -18,9 +21,13 @@ use sc_telemetry::{Telemetry, TelemetryWorker};
 use sp_runtime::traits::{BlakeTwo256, Block as BlockT};
 use sp_trie::PrefixedMemoryDB;
 pub mod chain_spec;
+#[cfg(feature = "cere-dev-native")]
+pub use cere_client::CereDevExecutorDispatch;
+#[cfg(feature = "cere-native")]
+pub use cere_client::CereExecutorDispatch;
 pub use cere_client::{
-	AbstractClient, CereDevExecutorDispatch, CereExecutorDispatch, Client, ClientHandle,
-	ExecuteWithClient, FullBackend, FullClient, RuntimeApiCollection,
+	AbstractClient, Client, ClientHandle, ExecuteWithClient, FullBackend, FullClient,
+	RuntimeApiCollection,
 };
 pub use chain_spec::{CereChainSpec, CereDevChainSpec};
 pub use node_primitives::{Block, BlockNumber};