update zcash local net pt2

docs/testing.md

@@ -13,12 +13,16 @@
 - To run client rpc tests:
 1) Simlink or copy compiled `zebrad`, zcashd` and `zcash-cli` binaries to `$ zaino/test_binaries/bins/*`
 2) Build release binary `cargo build --release` WARNING: these tests do not use the binary built by cargo nextest
-3) Generate the chain cache `cargo nextest run generate_zcashd_chain_cach --run-ignored ignored-only --features test_fixtures`
+3) Generate the chain cache `cargo nextest run generate_zcashd_chain_cache --run-ignored ignored-only`
 4) Run `cargo nextest run --test client_rpcs`
 
-- To Run client rpc testnet tests i.e. `get_subtree_roots_sapling`:
-1) sync Zebrad testnet to at least 2 sapling and 2 orchard shards
-2) copy the Zebrad cache to `zaino/integration-tests/chain_cache/testnet_get_subtree_roots_sapling` directory.
-3) copy the Zebrad cache to `zaino/integration-tests/chain_cache/testnet_get_subtree_roots_orchard` directory.
+- To run client rpc test `get_subtree_roots_sapling`:
+1) sync Zebrad testnet to at least 2 sapling shards
+2) copy the Zebrad testnet `state` cache to `zaino/integration-tests/chain_cache/get_subtree_roots_sapling` directory.
 See the `get_subtree_roots_sapling` test fixture doc comments in zcash_local_net for more details.
 
+- To run client rpc test `get_subtree_roots_orchard`:
+1) sync Zebrad mainnet to at least 2 orchard shards
+2) copy the Zebrad mainnet `state` cache to `zaino/integration-tests/chain_cache/get_subtree_roots_orchard` directory.
+See the `get_subtree_roots_orchard` test fixture doc comments in zcash_local_net for more details.
+

integration-tests/Cargo.toml

@@ -7,18 +7,12 @@ authors = { workspace = true }
 license = { workspace = true }
 repository = { workspace = true }
 
-
-[features]
-# Used by zcash-local-net:
-test_fixtures = []
-
 [dependencies]
 # Test utility
 zaino-testutils = { path = "../zaino-testutils" }
 
 # Test fixtures
-zcash_local_net = { git = "https://github.com/Oscar-Pepper/zcash-local-net.git", branch = "testnet_framework", features = [ "test_fixtures" ] }
-# zcash_local_net = { git = "https://github.com/zingolabs/zcash-local-net.git", branch = "dev", features = [ "test_fixtures" ] }
+zcash_local_net = { git = "https://github.com/zingolabs/zcash-local-net.git", branch = "dev", features = [ "test_fixtures" ] }
 
 # Lightclient
 zingolib = { workspace = true }

integration-tests/tests/client_rpcs.rs

@@ -1,10 +1,13 @@
 //! Tests Zainod release binary against the `zcash_local_net` client RPC test fixtures.
 //!
+//! Ensure the release binary is up-to-date with `cargo build --release` before running this test-suite.
+//!
 //! See `Testing` section of README.md for more details.
 
 use std::path::PathBuf;
 
 use once_cell::sync::Lazy;
+use zcash_local_net::network::Network;
 
 static ZCASHD_BIN: Lazy<Option<PathBuf>> = Lazy::new(|| {
     let mut workspace_root_path = PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap());
@@ -372,7 +375,7 @@ async fn get_latest_tree_state() {
 }
 
 /// This test requires Zebrad testnet to be already synced to at least 2 sapling shards with the cache at
-/// `zaino/chain_cache/testnet_get_subtree_roots`
+/// `zaino/chain_cache/get_subtree_roots_sapling`
 ///
 /// See doc comments of test_fixture for more details.
 #[tokio::test]
@@ -383,12 +386,13 @@ async fn get_subtree_roots_sapling() {
         ZEBRAD_BIN.clone(),
         ZAINOD_BIN.clone(),
         LIGHTWALLETD_BIN.clone(),
+        Network::Testnet,
     )
     .await;
 }
 
 /// This test requires Zebrad testnet to be already synced to at least 2 orchard shards with the cache at
-/// `zaino/chain_cache/testnet_get_subtree_roots`
+/// `zaino/chain_cache/get_subtree_roots_orchard`
 ///
 /// See doc comments of test_fixture for more details.
 #[tokio::test]
@@ -399,6 +403,7 @@ async fn get_subtree_roots_orchard() {
         ZEBRAD_BIN.clone(),
         ZAINOD_BIN.clone(),
         LIGHTWALLETD_BIN.clone(),
+        Network::Mainnet,
     )
     .await;
 }