chore(code): Rename malachite-cli to malachite-test-cli (#685)

informalsystems · Dec 16, 2024 · 8d71152 · 8d71152
1 parent 08a19d8
commit 8d71152
Show file tree

Hide file tree

Showing 20 changed files with 37 additions and 37 deletions.
diff --git a/code/Cargo.lock b/code/Cargo.lock
diff --git a/code/Cargo.toml b/code/Cargo.toml
@@ -4,7 +4,6 @@ resolver = "2"
 members = [
   "crates/app",
   "crates/app-channel",
-  "crates/cli",
   "crates/codec",
   "crates/config",
   "crates/consensus",
@@ -26,6 +25,7 @@ members = [
 
   # Test
   "crates/test",
+  "crates/test/cli",
   "crates/test/mbt",
   "crates/test/mempool",
   "crates/network/test",
@@ -62,7 +62,7 @@ debug = true
 malachite-engine             = { version = "0.1.0", path = "crates/engine" }
 malachite-app                = { version = "0.1.0", path = "crates/app" }
 malachite-app-channel        = { version = "0.1.0", path = "crates/app-channel" }
-malachite-cli                = { version = "0.1.0", path = "crates/cli" }
+malachite-test-cli           = { version = "0.1.0", path = "crates/test/cli" }
 malachite-codec              = { version = "0.1.0", path = "crates/codec" }
 malachite-config             = { version = "0.1.0", path = "crates/config" }
 malachite-consensus          = { version = "0.1.0", path = "crates/consensus" }

diff --git a/code/crates/starknet/app/Cargo.toml b/code/crates/starknet/app/Cargo.toml
@@ -11,7 +11,7 @@ publish                = false
 workspace = true
 
 [dependencies]
-malachite-cli = { workspace = true }
+malachite-test-cli = { workspace = true }
 malachite-config = { workspace = true }
 malachite-starknet-host = { workspace = true }
 

diff --git a/code/crates/starknet/app/src/main.rs b/code/crates/starknet/app/src/main.rs
@@ -1,7 +1,7 @@
 use color_eyre::eyre::eyre;
-use malachite_cli::args::{Args, Commands};
-use malachite_cli::{logging, runtime};
 use malachite_starknet_host::node::StarknetNode;
+use malachite_test_cli::args::{Args, Commands};
+use malachite_test_cli::{logging, runtime};
 use tracing::{error, info, trace};
 
 // Use jemalloc on Linux
@@ -103,10 +103,10 @@ mod tests {
     use clap::Parser;
     use color_eyre::eyre;
     use color_eyre::eyre::eyre;
-    use malachite_cli::args::{Args, Commands};
-    use malachite_cli::cmd::init::*;
     use malachite_config::LoggingConfig;
     use malachite_starknet_host::node::StarknetNode;
+    use malachite_test_cli::args::{Args, Commands};
+    use malachite_test_cli::cmd::init::*;
 
     #[test]
     fn running_init_creates_config_files() -> eyre::Result<()> {

diff --git a/code/crates/starknet/host/Cargo.toml b/code/crates/starknet/host/Cargo.toml
@@ -46,4 +46,4 @@ workspace = true
 
 [dev-dependencies]
 tempfile.workspace = true
-malachite-cli.workspace = true
+malachite-test-cli.workspace = true
diff --git a/code/crates/starknet/host/src/node.rs b/code/crates/starknet/host/src/node.rs
@@ -179,7 +179,7 @@ fn test_starknet_node() {
     };
 
     // Create configuration files
-    use malachite_cli::*;
+    use malachite_test_cli::*;
 
     let priv_keys = new::generate_private_keys(&node, 1, true);
     let pub_keys = priv_keys.iter().map(|pk| node.get_public_key(pk)).collect();
@@ -197,7 +197,7 @@ fn test_starknet_node() {
     // Run the node for a few seconds
     const TIMEOUT: u64 = 3;
     use tokio::time::{timeout, Duration};
-    let rt = malachite_cli::runtime::build_runtime(node.config.runtime).unwrap();
+    let rt = malachite_test_cli::runtime::build_runtime(node.config.runtime).unwrap();
     let result = rt.block_on(async { timeout(Duration::from_secs(TIMEOUT), node.run()).await });
 
     // Check that the node did not quit before the timeout.

diff --git a/code/crates/cli/Cargo.toml → code/crates/test/cli/Cargo.toml b/code/crates/cli/Cargo.toml → code/crates/test/cli/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name                 = "malachite-cli"
+name                 = "malachite-test-cli"
 version.workspace    = true
 edition.workspace    = true
 repository.workspace = true

diff --git a/code/crates/cli/src/args.rs → code/crates/test/cli/src/args.rs b/code/crates/cli/src/args.rs → code/crates/test/cli/src/args.rs
diff --git a/...crates/cli/src/cmd/distributed_testnet.rs → ...s/test/cli/src/cmd/distributed_testnet.rs b/...crates/cli/src/cmd/distributed_testnet.rs → ...s/test/cli/src/cmd/distributed_testnet.rs
diff --git a/code/crates/cli/src/cmd/init.rs → code/crates/test/cli/src/cmd/init.rs b/code/crates/cli/src/cmd/init.rs → code/crates/test/cli/src/cmd/init.rs
diff --git a/code/crates/cli/src/cmd/mod.rs → code/crates/test/cli/src/cmd/mod.rs b/code/crates/cli/src/cmd/mod.rs → code/crates/test/cli/src/cmd/mod.rs
diff --git a/code/crates/cli/src/cmd/start.rs → code/crates/test/cli/src/cmd/start.rs b/code/crates/cli/src/cmd/start.rs → code/crates/test/cli/src/cmd/start.rs
diff --git a/code/crates/cli/src/cmd/testnet.rs → code/crates/test/cli/src/cmd/testnet.rs b/code/crates/cli/src/cmd/testnet.rs → code/crates/test/cli/src/cmd/testnet.rs
diff --git a/code/crates/cli/src/error.rs → code/crates/test/cli/src/error.rs b/code/crates/cli/src/error.rs → code/crates/test/cli/src/error.rs
diff --git a/code/crates/cli/src/file.rs → code/crates/test/cli/src/file.rs b/code/crates/cli/src/file.rs → code/crates/test/cli/src/file.rs
diff --git a/code/crates/cli/src/lib.rs → code/crates/test/cli/src/lib.rs b/code/crates/cli/src/lib.rs → code/crates/test/cli/src/lib.rs
diff --git a/code/crates/cli/src/logging.rs → code/crates/test/cli/src/logging.rs b/code/crates/cli/src/logging.rs → code/crates/test/cli/src/logging.rs
diff --git a/code/crates/cli/src/metrics.rs → code/crates/test/cli/src/metrics.rs b/code/crates/cli/src/metrics.rs → code/crates/test/cli/src/metrics.rs
diff --git a/code/crates/cli/src/new.rs → code/crates/test/cli/src/new.rs b/code/crates/cli/src/new.rs → code/crates/test/cli/src/new.rs
diff --git a/code/crates/cli/src/runtime.rs → code/crates/test/cli/src/runtime.rs b/code/crates/cli/src/runtime.rs → code/crates/test/cli/src/runtime.rs