Skip to content

Commit

Permalink
added basic send test, updated zcash-local-net dep branch.
Browse files Browse the repository at this point in the history
  • Loading branch information
@idky137
idky137 committed Nov 28, 2024
1 parent 383736a commit 81a2e50
Show file tree
Hide file tree
Showing 4 changed files with 160 additions and 44 deletions.
14 changes: 7 additions & 7 deletions Cargo.lock
View file

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

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ version = "0.1.1"

[workspace.dependencies]
# Zingolabs
zingolib = { git = "https://github.com/zingolabs/zingolib.git", tag = "zaino_dep_002_091024_95e5b0d8f9d5ee0485c6141533da2f727aeafae2", features = ["zaino-test"] }
# zingolib = { git = "https://github.com/zingolabs/zingolib.git", tag = "zaino_dep_002_091024_95e5b0d8f9d5ee0485c6141533da2f727aeafae2", features = ["zaino-test"] }
zingolib = { git = "https://github.com/Oscar-Pepper/zingolib.git", branch = "zaino_dep_002_091024_95e5b0d8f9d5ee0485c6141533da2f727aeafae2_with_output_ordering", features = [ "test-elevation" ] }

# Librustzcash
zcash_protocol = { git = "https://github.com/zingolabs/librustzcash.git", tag = "zcash_client_sqlite-0.11.2_plus_zingolabs_changes-1-g7ad60b5d5-2-g121371a08" }
Expand All @@ -35,8 +36,7 @@ zebra-chain = { git = "https://github.com/ZcashFoundation/zebra.git", rev = "4eb
zebra-rpc = { git = "https://github.com/ZcashFoundation/zebra.git", rev = "4eb285de50848f1a4dcebd0fbe353e4f150fd371" }

# Zcash-Local-Net
zcash_local_net = { git = "https://github.com/idky137/zcash-local-net.git", branch = "make_indexer_optional", features = [ "test_fixtures" ] }

zcash_local_net = { git = "https://github.com/Oscar-Pepper/zcash-local-net.git", branch = "add_zebrad_basic_send_tests", features = [ "test_fixtures" ] }

# Miscellaneous
tokio = { version = "1.38", features = ["full"] }
Expand Down
18 changes: 9 additions & 9 deletions integration-tests/tests/wallet_to_validator.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#![forbid(unsafe_code)]

use std::sync::Arc;
use zaino_testutils::TestManager2;
use zaino_testutils::TestManager;
use zcash_local_net::validator::Validator;
use zingolib::testutils::lightclient::from_inputs;

Expand All @@ -13,7 +13,7 @@ mod wallet_basic {
#[tokio::test]
async fn connect_to_node_get_info() {
for validator in ["zebrad", "zcashd"] {
let mut test_manager = TestManager2::launch(validator, None, true, true)
let mut test_manager = TestManager::launch(validator, None, true, true)
.await
.unwrap();
let clients = test_manager
Expand All @@ -31,7 +31,7 @@ mod wallet_basic {
#[tokio::test]
async fn send_to_orchard() {
for validator in ["zcashd"] {
let mut test_manager = TestManager2::launch(validator, None, true, true)
let mut test_manager = TestManager::launch(validator, None, true, true)
.await
.unwrap();
let clients = test_manager
Expand Down Expand Up @@ -71,7 +71,7 @@ mod wallet_basic {
#[tokio::test]
async fn send_to_sapling() {
for validator in ["zcashd"] {
let mut test_manager = TestManager2::launch(validator, None, true, true)
let mut test_manager = TestManager::launch(validator, None, true, true)
.await
.unwrap();
let clients = test_manager
Expand Down Expand Up @@ -111,7 +111,7 @@ mod wallet_basic {
#[tokio::test]
async fn send_to_transparent() {
for validator in ["zcashd"] {
let mut test_manager = TestManager2::launch(validator, None, true, true)
let mut test_manager = TestManager::launch(validator, None, true, true)
.await
.unwrap();
let clients = test_manager
Expand Down Expand Up @@ -152,7 +152,7 @@ mod wallet_basic {
#[tokio::test]
async fn send_to_all() {
for validator in ["zcashd"] {
let mut test_manager = TestManager2::launch(validator, None, true, true)
let mut test_manager = TestManager::launch(validator, None, true, true)
.await
.unwrap();
let clients = test_manager
Expand Down Expand Up @@ -232,7 +232,7 @@ mod wallet_basic {
#[tokio::test]
async fn shield() {
for validator in ["zcashd"] {
let mut test_manager = TestManager2::launch(validator, None, true, true)
let mut test_manager = TestManager::launch(validator, None, true, true)
.await
.unwrap();
let clients = test_manager
Expand Down Expand Up @@ -287,7 +287,7 @@ mod wallet_basic {
#[tokio::test]
async fn sync_full_batch() {
for validator in ["zcashd"] {
let mut test_manager = TestManager2::launch(validator, None, true, true)
let mut test_manager = TestManager::launch(validator, None, true, true)
.await
.unwrap();
let clients = test_manager
Expand Down Expand Up @@ -370,7 +370,7 @@ mod wallet_basic {
#[tokio::test]
async fn monitor_unverified_mempool() {
for validator in ["zcashd"] {
let mut test_manager = TestManager2::launch(validator, None, true, true)
let mut test_manager = TestManager::launch(validator, None, true, true)
.await
.unwrap();
let clients = test_manager
Expand Down
Loading

0 comments on commit 81a2e50

Please sign in to comment.