Zingo config public api rework pt1

Cargo.toml

@@ -40,15 +40,12 @@ zcash_keys = { version = "0.12", features = [
 zcash_note_encryption = "0.4"
 zcash_primitives = "0.26"
 zcash_proofs = "0.26"
-zcash_protocol = "0.7"
+zcash_protocol = "0.7" # public API (TODO: remove from public API)
 zcash_transparent = "0.6"
 
-# Zebra
-zebra-chain = "5.0.0"
-
 # Zingo-common
 zingo-netutils = "1.1.0"
-zingo_common_components = { git = "https://github.com/zingolabs/zingo-common.git", version = "0.2" }
+zingo_common_components = { git = "https://github.com/zingolabs/zingo-common.git", branch = "dev" }
 
 # Parallel processing
 crossbeam-channel = "0.5"
@@ -120,7 +117,7 @@ zingo-status = { path = "zingo-status" } # NOTE: for development between release
 # zingo-status = "0.1.0"
 pepper-sync = { path = "pepper-sync" }
 zingolib = { path = "zingolib" }
-zcash_local_net = { git = "https://github.com/zingolabs/infrastructure.git", rev = "e4714fd" }
+zcash_local_net = { git = "https://github.com/Oscar-Pepper/infrastructure.git", branch = "remove_zebra_from_public_api" }
 zingo_test_vectors = { git = "https://github.com/zingolabs/infrastructure.git", rev = "e4714fd" }
 
 [profile.test]

darkside-tests/Cargo.toml

@@ -10,14 +10,12 @@ chain_generic_tests = []
 [dependencies]
 zingolib = { workspace = true, features = ["darkside_tests", "testutils"] }
 zingo-netutils = { workspace = true }
-zingo_common_components = { workspace = true, features = ["for_test"] }
+zingo_common_components = { workspace = true }
 
 zingolib_testutils = { version = "0.1.0", path = "../zingolib_testutils" }
 zcash_local_net.workspace = true
 zingo_test_vectors.workspace = true
 
-zebra-chain = { workspace = true }
-
 orchard = { workspace = true }
 sapling-crypto = { workspace = true }
 incrementalmerkletree = { workspace = true }

darkside-tests/src/chain_generics.rs

@@ -76,13 +76,13 @@ pub(crate) mod conduct_chain {
                 .make_unique_data_dir_and_load_config(self.configured_activation_heights);
             let mut lightclient = LightClient::create_from_wallet(
                 LightWallet::new(
-                    config.chain,
+                    config.network_type(),
                     WalletBase::Mnemonic {
                         mnemonic: Mnemonic::from_phrase(DARKSIDE_SEED.to_string()).unwrap(),
                         no_of_accounts: NonZeroU32::try_from(1).expect("hard-coded integer"),
                     },
-                    0.into(),
-                    config.wallet_settings.clone(),
+                    1.into(),
+                    config.wallet_settings(),
                 )
                 .unwrap(),
                 config,

darkside-tests/src/utils.rs

@@ -329,8 +329,7 @@ pub mod scenarios {
     use zcash_local_net::indexer::lightwalletd::Lightwalletd;
     use zcash_protocol::consensus::{BlockHeight, BranchId};
     use zcash_protocol::{PoolType, ShieldedProtocol};
-    use zebra_chain::parameters::testnet;
-    use zingo_common_components::protocol::activation_heights::for_test;
+    use zingo_common_components::protocol::ActivationHeights;
 
     use super::{
         DarksideConnector, init_darksidewalletd, update_tree_states_for_transaction,
@@ -348,7 +347,7 @@ pub mod scenarios {
         lightwalletd: Lightwalletd,
         pub(crate) darkside_connector: DarksideConnector,
         pub(crate) client_builder: ClientBuilder,
-        pub(crate) configured_activation_heights: testnet::ConfiguredActivationHeights,
+        pub(crate) configured_activation_heights: ActivationHeights,
         faucet: Option<LightClient>,
         lightclients: Vec<LightClient>,
         pub(crate) staged_blockheight: BlockHeight,
@@ -365,7 +364,7 @@ pub mod scenarios {
                 darkside_connector.0.clone(),
                 zingolib::testutils::tempfile::tempdir().unwrap(),
             );
-            let configured_activation_heights = for_test::all_height_one_nus();
+            let configured_activation_heights = ActivationHeights::default();
             DarksideEnvironment {
                 lightwalletd,
                 darkside_connector,
@@ -397,7 +396,7 @@ pub mod scenarios {
             assert!(self.faucet.is_none(), "Error: Faucet already exists!");
             self.faucet = Some(self.client_builder.build_client(
                 zingo_test_vectors::seeds::DARKSIDE_SEED.to_string(),
-                0,
+                1,
                 true,
                 self.configured_activation_heights,
             ));
@@ -676,7 +675,7 @@ pub mod scenarios {
         pub fn get_client_builder(&self) -> &ClientBuilder {
             &self.client_builder
         }
-        pub fn get_activation_heights(&self) -> testnet::ConfiguredActivationHeights {
+        pub fn get_activation_heights(&self) -> ActivationHeights {
             self.configured_activation_heights
         }
         pub fn get_faucet(&mut self) -> &mut LightClient {

darkside-tests/tests/advanced_reorg_tests.rs

@@ -15,7 +15,7 @@ use tokio::time::sleep;
 use zcash_local_net::indexer::Indexer;
 use zcash_local_net::network::localhost_uri;
 use zcash_protocol::consensus::BlockHeight;
-use zingo_common_components::protocol::activation_heights::for_test;
+use zingo_common_components::protocol::ActivationHeights;
 use zingolib::testutils::tempfile::TempDir;
 use zingolib::wallet::summary::data::SentValueTransfer;
 use zingolib::wallet::summary::data::ValueTransferKind;
@@ -41,7 +41,7 @@ async fn reorg_changes_incoming_tx_height() {
         ADVANCED_REORG_TESTS_USER_WALLET.to_string(),
         202,
         true,
-        for_test::all_height_one_nus(),
+        ActivationHeights::default(),
     );
 
     light_client.sync_and_await().await.unwrap();
@@ -199,7 +199,7 @@ async fn reorg_changes_incoming_tx_index() {
         ADVANCED_REORG_TESTS_USER_WALLET.to_string(),
         202,
         true,
-        for_test::all_height_one_nus(),
+        ActivationHeights::default(),
     );
 
     light_client.sync_and_await().await.unwrap();
@@ -357,7 +357,7 @@ async fn reorg_expires_incoming_tx() {
         ADVANCED_REORG_TESTS_USER_WALLET.to_string(),
         202,
         true,
-        for_test::all_height_one_nus(),
+        ActivationHeights::default(),
     );
 
     light_client.sync_and_await().await.unwrap();
@@ -537,7 +537,7 @@ async fn reorg_changes_outgoing_tx_height() {
         ADVANCED_REORG_TESTS_USER_WALLET.to_string(),
         202,
         true,
-        for_test::all_height_one_nus(),
+        ActivationHeights::default(),
     );
 
     light_client.sync_and_await().await.unwrap();
@@ -792,7 +792,7 @@ async fn reorg_expires_outgoing_tx_height() {
         ADVANCED_REORG_TESTS_USER_WALLET.to_string(),
         202,
         true,
-        for_test::all_height_one_nus(),
+        ActivationHeights::default(),
     );
 
     let expected_initial_balance = AccountBalance {
@@ -992,7 +992,7 @@ async fn reorg_changes_outgoing_tx_index() {
         ADVANCED_REORG_TESTS_USER_WALLET.to_string(),
         202,
         true,
-        for_test::all_height_one_nus(),
+        ActivationHeights::default(),
     );
 
     light_client.sync_and_await().await.unwrap();