Merge pull request #53 from dusk-network/reorg-cli-52

Reorganized CLI subprojects
dusk-network · Nov 22, 2023 · ddc9cc1 · ddc9cc1
2 parents 3e73a7d + ae375e4
commit ddc9cc1
Show file tree

Hide file tree

Showing 34 changed files with 9 additions and 27 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,2 +1,2 @@
 [workspace]
-members = ["testing-utils/test-moat-cli", "moat-cli-common", "moat-cli-user", "moat-cli-lp", "moat-cli-sp", "testing-utils/test-moat-request", "moat-core", "wallet-accessor", "integration-tests", "macros/code-hasher", "moat-example"]
+members = ["testing-utils/test-moat-cli", "moat-cli/moat-cli-common", "moat-cli/moat-cli-user", "moat-cli/moat-cli-lp", "moat-cli/moat-cli-sp", "testing-utils/test-moat-request", "moat-core", "wallet-accessor", "integration-tests", "macros/code-hasher", "moat-example"]
diff --git a/moat-cli-common/Cargo.toml → moat-cli/moat-cli-common/Cargo.toml b/moat-cli-common/Cargo.toml → moat-cli/moat-cli-common/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-moat-core = { path = "../moat-core" }
+moat-core = { path = "../../moat-core" }
 dusk-plonk = { version = "0.16", default-features = false, features = ["rkyv-impl", "alloc"] }
 dusk-wallet = "0.20.1-rc.0"
 clap = { version = "4.0", features = ["derive", "env"] }

diff --git a/moat-cli-common/src/error.rs → moat-cli/moat-cli-common/src/error.rs b/moat-cli-common/src/error.rs → moat-cli/moat-cli-common/src/error.rs
diff --git a/moat-cli-common/src/lib.rs → moat-cli/moat-cli-common/src/lib.rs b/moat-cli-common/src/lib.rs → moat-cli/moat-cli-common/src/lib.rs
diff --git a/moat-cli-lp/Cargo.toml → moat-cli/moat-cli-lp/Cargo.toml b/moat-cli-lp/Cargo.toml → moat-cli/moat-cli-lp/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 [dependencies]
 dusk-wallet = "0.20.1-rc.0"
 dusk-jubjub = { version = "0.13", default-features = false }
-wallet-accessor = { path = "../wallet-accessor" }
-moat-core = { path = "../moat-core" }
+wallet-accessor = { path = "../../wallet-accessor" }
+moat-core = { path = "../../moat-core" }
 moat-cli-common = { path = "../moat-cli-common" }
 dusk-pki = "0.13"
 zk-citadel = "0.6.0-rc.0"

diff --git a/moat-cli-lp/README.md → moat-cli/moat-cli-lp/README.md b/moat-cli-lp/README.md → moat-cli/moat-cli-lp/README.md
diff --git a/moat-cli-lp/src/args.rs → moat-cli/moat-cli-lp/src/args.rs b/moat-cli-lp/src/args.rs → moat-cli/moat-cli-lp/src/args.rs
diff --git a/moat-cli-lp/src/command.rs → moat-cli/moat-cli-lp/src/command.rs b/moat-cli-lp/src/command.rs → moat-cli/moat-cli-lp/src/command.rs
diff --git a/moat-cli-lp/src/config.rs → moat-cli/moat-cli-lp/src/config.rs b/moat-cli-lp/src/config.rs → moat-cli/moat-cli-lp/src/config.rs
diff --git a/moat-cli-lp/src/interactor.rs → moat-cli/moat-cli-lp/src/interactor.rs b/moat-cli-lp/src/interactor.rs → moat-cli/moat-cli-lp/src/interactor.rs
diff --git a/moat-cli-lp/src/main.rs → moat-cli/moat-cli-lp/src/main.rs b/moat-cli-lp/src/main.rs → moat-cli/moat-cli-lp/src/main.rs
@@ -74,11 +74,5 @@ async fn main() -> Result<(), Error> {
 
     interactor.run_loop().await?;
 
-    #[rustfmt::skip]
-        // old wallet.dat file format:
-        // cargo r --release --bin moat-cli-lp -- --wallet-path ~/.dusk/rusk-wallet --pwd-hash 7f2611ba158b6dcea4a69c229c303358c5e04493abeadee106a4bfa464d55787
-        // new wallet.dat file format:
-        // cargo r --release --bin moat-cli-lp -- --wallet-path ~/.dusk/rusk-wallet --pwd-hash 5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8
-
-        Ok(())
+    Ok(())
 }
diff --git a/moat-cli-lp/src/menu.rs → moat-cli/moat-cli-lp/src/menu.rs b/moat-cli-lp/src/menu.rs → moat-cli/moat-cli-lp/src/menu.rs
diff --git a/moat-cli-lp/src/prompt.rs → moat-cli/moat-cli-lp/src/prompt.rs b/moat-cli-lp/src/prompt.rs → moat-cli/moat-cli-lp/src/prompt.rs
diff --git a/moat-cli-lp/src/run_result.rs → moat-cli/moat-cli-lp/src/run_result.rs b/moat-cli-lp/src/run_result.rs → moat-cli/moat-cli-lp/src/run_result.rs
diff --git a/moat-cli-sp/Cargo.toml → moat-cli/moat-cli-sp/Cargo.toml b/moat-cli-sp/Cargo.toml → moat-cli/moat-cli-sp/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 
 [dependencies]
 dusk-wallet = "0.20.1-rc.0"
-wallet-accessor = { path = "../wallet-accessor" }
-moat-core = { path = "../moat-core" }
+wallet-accessor = { path = "../../wallet-accessor" }
+moat-core = { path = "../../moat-core" }
 moat-cli-common = { path = "../moat-cli-common" }
 zk-citadel = "0.6.0-rc.0"
 rkyv = { version = "=0.7.39" }

diff --git a/moat-cli-sp/README.md → moat-cli/moat-cli-sp/README.md b/moat-cli-sp/README.md → moat-cli/moat-cli-sp/README.md
diff --git a/moat-cli-sp/config.toml → moat-cli/moat-cli-sp/config.toml b/moat-cli-sp/config.toml → moat-cli/moat-cli-sp/config.toml
diff --git a/moat-cli-sp/src/args.rs → moat-cli/moat-cli-sp/src/args.rs b/moat-cli-sp/src/args.rs → moat-cli/moat-cli-sp/src/args.rs
diff --git a/moat-cli-sp/src/command.rs → moat-cli/moat-cli-sp/src/command.rs b/moat-cli-sp/src/command.rs → moat-cli/moat-cli-sp/src/command.rs
diff --git a/moat-cli-sp/src/config.rs → moat-cli/moat-cli-sp/src/config.rs b/moat-cli-sp/src/config.rs → moat-cli/moat-cli-sp/src/config.rs
diff --git a/moat-cli-sp/src/interactor.rs → moat-cli/moat-cli-sp/src/interactor.rs b/moat-cli-sp/src/interactor.rs → moat-cli/moat-cli-sp/src/interactor.rs
diff --git a/moat-cli-sp/src/main.rs → moat-cli/moat-cli-sp/src/main.rs b/moat-cli-sp/src/main.rs → moat-cli/moat-cli-sp/src/main.rs
@@ -68,11 +68,5 @@ async fn main() -> Result<(), Error> {
 
     interactor.run_loop().await?;
 
-    #[rustfmt::skip]
-    // old wallet.dat file format:
-    // cargo r --release --bin moat-cli-sp -- --wallet-path ~/.dusk/rusk-wallet --config-path ./moat-cli-sp/config.toml --pwd-hash 7f2611ba158b6dcea4a69c229c303358c5e04493abeadee106a4bfa464d55787
-    // new wallet.dat file format:
-    // cargo r --release --bin moat-cli-sp -- --wallet-path ~/.dusk/rusk-wallet --config-path ./moat-cli-sp/config.toml --pwd-hash 5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8
-
     Ok(())
 }
diff --git a/moat-cli-sp/src/menu.rs → moat-cli/moat-cli-sp/src/menu.rs b/moat-cli-sp/src/menu.rs → moat-cli/moat-cli-sp/src/menu.rs
diff --git a/moat-cli-sp/src/prompt.rs → moat-cli/moat-cli-sp/src/prompt.rs b/moat-cli-sp/src/prompt.rs → moat-cli/moat-cli-sp/src/prompt.rs
diff --git a/moat-cli-sp/src/run_result.rs → moat-cli/moat-cli-sp/src/run_result.rs b/moat-cli-sp/src/run_result.rs → moat-cli/moat-cli-sp/src/run_result.rs
diff --git a/moat-cli-user/Cargo.toml → moat-cli/moat-cli-user/Cargo.toml b/moat-cli-user/Cargo.toml → moat-cli/moat-cli-user/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 
 [dependencies]
 dusk-wallet = "0.20.1-rc.0"
-wallet-accessor = { path = "../wallet-accessor" }
-moat-core = { path = "../moat-core" }
+wallet-accessor = { path = "../../wallet-accessor" }
+moat-core = { path = "../../moat-core" }
 moat-cli-common = { path = "../moat-cli-common" }
 zk-citadel = "0.6.0-rc.0"
 dusk-plonk = { version = "0.16", default-features = false, features = ["rkyv-impl", "alloc"] }

diff --git a/moat-cli-user/README.md → moat-cli/moat-cli-user/README.md b/moat-cli-user/README.md → moat-cli/moat-cli-user/README.md
diff --git a/moat-cli-user/src/args.rs → moat-cli/moat-cli-user/src/args.rs b/moat-cli-user/src/args.rs → moat-cli/moat-cli-user/src/args.rs
diff --git a/moat-cli-user/src/command.rs → moat-cli/moat-cli-user/src/command.rs b/moat-cli-user/src/command.rs → moat-cli/moat-cli-user/src/command.rs
diff --git a/moat-cli-user/src/interactor.rs → moat-cli/moat-cli-user/src/interactor.rs b/moat-cli-user/src/interactor.rs → moat-cli/moat-cli-user/src/interactor.rs
diff --git a/moat-cli-user/src/main.rs → moat-cli/moat-cli-user/src/main.rs b/moat-cli-user/src/main.rs → moat-cli/moat-cli-user/src/main.rs
@@ -70,11 +70,5 @@ async fn main() -> Result<(), Error> {
 
     interactor.run_loop().await?;
 
-    #[rustfmt::skip]
-    // old wallet.dat file format:
-    // cargo r --release --bin moat-cli-user -- --wallet-path ~/.dusk/rusk-wallet --pwd-hash 7f2611ba158b6dcea4a69c229c303358c5e04493abeadee106a4bfa464d55787
-    // new wallet.dat file format:
-    // cargo r --release --bin moat-cli-user -- --wallet-path ~/.dusk/rusk-wallet --pwd-hash 5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8
-
     Ok(())
 }
diff --git a/moat-cli-user/src/menu.rs → moat-cli/moat-cli-user/src/menu.rs b/moat-cli-user/src/menu.rs → moat-cli/moat-cli-user/src/menu.rs
diff --git a/moat-cli-user/src/prompt.rs → moat-cli/moat-cli-user/src/prompt.rs b/moat-cli-user/src/prompt.rs → moat-cli/moat-cli-user/src/prompt.rs
diff --git a/moat-cli-user/src/run_result.rs → moat-cli/moat-cli-user/src/run_result.rs b/moat-cli-user/src/run_result.rs → moat-cli/moat-cli-user/src/run_result.rs