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.

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

Remove nym pt2 #103

Merged
merged 2 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 26 additions & 28 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ members = [
"zaino-testutils",
"zainod",
"zaino-serve",
# "zaino-wallet",
# "zaino-nym",
"zaino-state",
"zaino-fetch",
"zaino-proto",
Expand All @@ -25,8 +23,6 @@ license = "Apache-2.0"

[workspace.dependencies]
# Zingolabs
#
# NOTE: This may have to move to Zaino-testutils once Nym code is reintroduced and Zaino-Wallet becomes a dependency of zingolib.
zingolib = { git = "https://github.com/zingolabs/zingolib.git", tag = "zaino_dep_002_091024_95e5b0d8f9d5ee0485c6141533da2f727aeafae2", features = ["zaino-test"] }

# Librustzcash
Expand All @@ -38,14 +34,6 @@ zcash_protocol = { git = "https://github.com/zingolabs/librustzcash.git", tag =
zebra-chain = { git = "https://github.com/ZcashFoundation/zebra.git", rev = "4eb285de50848f1a4dcebd0fbe353e4f150fd371" }
zebra-rpc = { git = "https://github.com/ZcashFoundation/zebra.git", rev = "4eb285de50848f1a4dcebd0fbe353e4f150fd371" }


# Temporarily removed until dependency conflict can be resolved.
# Nym
# nym-sdk = { git = "https://github.com/nymtech/nym", branch = "master" }
# nym-sphinx-addressing = { git = "https://github.com/nymtech/nym", branch = "master" }
# nym-bin-common = { git = "https://github.com/nymtech/nym", branch = "master" }
# nym-sphinx-anonymous-replies = { git = "https://github.com/nymtech/nym", branch = "master" }

# Miscellaneous
tokio = { version = "1.38", features = ["full"] }
tonic = "0.12"
Expand Down
3 changes: 0 additions & 3 deletions integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ repository = { workspace = true }


[features]
# NOTE: Deprecated
nym_poc = []

# Used by zcash-local-net:
test_fixtures = []

Expand Down
6 changes: 1 addition & 5 deletions integration-tests/tests/integrations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use std::sync::{atomic::AtomicBool, Arc};
use zaino_testutils::{drop_test_manager, zingo_lightclient::get_address, TestManager};

mod wallet_basic {
mod zingo_wallet_basic {
use zingolib::{lightclient::LightClient, testutils::lightclient::from_inputs};

use super::*;
Expand Down Expand Up @@ -314,7 +314,3 @@ mod wallet_basic {
.await;
}
}

mod nym {
// TODO: Build nym enhanced zingolib version using zingo-rpc::walletrpc::service.
}
19 changes: 0 additions & 19 deletions zaino-nym/Cargo.toml

This file was deleted.

68 changes: 0 additions & 68 deletions zaino-nym/src/client.rs

This file was deleted.

49 changes: 0 additions & 49 deletions zaino-nym/src/error.rs

This file was deleted.

8 changes: 0 additions & 8 deletions zaino-nym/src/lib.rs

This file was deleted.

Loading
Loading