Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganized CLI subprojects #53

Merged
merged 1 commit into from
Nov 22, 2023
Merged

Reorganized CLI subprojects #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
2 changes: 1 addition & 1 deletion moat-cli-common/Cargo.toml → moat-cli/moat-cli-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
0 moat-cli-common/src/error.rs → moat-cli/moat-cli-common/src/error.rs
View file
Open in desktop
File renamed without changes.
0 moat-cli-common/src/lib.rs → moat-cli/moat-cli-common/src/lib.rs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions moat-cli-lp/Cargo.toml → moat-cli/moat-cli-lp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 moat-cli-lp/README.md → moat-cli/moat-cli-lp/README.md
View file
Open in desktop
File renamed without changes.
0 moat-cli-lp/src/args.rs → moat-cli/moat-cli-lp/src/args.rs
View file
Open in desktop
File renamed without changes.
0 moat-cli-lp/src/command.rs → moat-cli/moat-cli-lp/src/command.rs
View file
Open in desktop
File renamed without changes.
0 moat-cli-lp/src/config.rs → moat-cli/moat-cli-lp/src/config.rs
View file
Open in desktop
File renamed without changes.
0 moat-cli-lp/src/interactor.rs → moat-cli/moat-cli-lp/src/interactor.rs
View file
Open in desktop
File renamed without changes.
8 changes: 1 addition & 7 deletions moat-cli-lp/src/main.rs → moat-cli/moat-cli-lp/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}
0 moat-cli-lp/src/menu.rs → moat-cli/moat-cli-lp/src/menu.rs
View file
Open in desktop
File renamed without changes.
0 moat-cli-lp/src/prompt.rs → moat-cli/moat-cli-lp/src/prompt.rs
View file
Open in desktop
File renamed without changes.
0 moat-cli-lp/src/run_result.rs → moat-cli/moat-cli-lp/src/run_result.rs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions moat-cli-sp/Cargo.toml → moat-cli/moat-cli-sp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
0 moat-cli-sp/README.md → moat-cli/moat-cli-sp/README.md
View file
Open in desktop
File renamed without changes.
0 moat-cli-sp/config.toml → moat-cli/moat-cli-sp/config.toml
View file
Open in desktop
File renamed without changes.
0 moat-cli-sp/src/args.rs → moat-cli/moat-cli-sp/src/args.rs
View file
Open in desktop
File renamed without changes.
0 moat-cli-sp/src/command.rs → moat-cli/moat-cli-sp/src/command.rs
View file
Open in desktop
File renamed without changes.
0 moat-cli-sp/src/config.rs → moat-cli/moat-cli-sp/src/config.rs
View file
Open in desktop
File renamed without changes.
0 moat-cli-sp/src/interactor.rs → moat-cli/moat-cli-sp/src/interactor.rs
View file
Open in desktop
File renamed without changes.
6 changes: 0 additions & 6 deletions moat-cli-sp/src/main.rs → moat-cli/moat-cli-sp/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}
0 moat-cli-sp/src/menu.rs → moat-cli/moat-cli-sp/src/menu.rs
View file
Open in desktop
File renamed without changes.
0 moat-cli-sp/src/prompt.rs → moat-cli/moat-cli-sp/src/prompt.rs
View file
Open in desktop
File renamed without changes.
0 moat-cli-sp/src/run_result.rs → moat-cli/moat-cli-sp/src/run_result.rs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions moat-cli-user/Cargo.toml → moat-cli/moat-cli-user/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
0 moat-cli-user/README.md → moat-cli/moat-cli-user/README.md
View file
Open in desktop
File renamed without changes.
0 moat-cli-user/src/args.rs → moat-cli/moat-cli-user/src/args.rs
View file
Open in desktop
File renamed without changes.
0 moat-cli-user/src/command.rs → moat-cli/moat-cli-user/src/command.rs
View file
Open in desktop
File renamed without changes.
0 moat-cli-user/src/interactor.rs → moat-cli/moat-cli-user/src/interactor.rs
View file
Open in desktop
File renamed without changes.
6 changes: 0 additions & 6 deletions moat-cli-user/src/main.rs → moat-cli/moat-cli-user/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}
0 moat-cli-user/src/menu.rs → moat-cli/moat-cli-user/src/menu.rs
View file
Open in desktop
File renamed without changes.
0 moat-cli-user/src/prompt.rs → moat-cli/moat-cli-user/src/prompt.rs
View file
Open in desktop
File renamed without changes.
0 moat-cli-user/src/run_result.rs → moat-cli/moat-cli-user/src/run_result.rs
View file
Open in desktop
File renamed without changes.