Tests of match move

zebra-chain/src/block/tests/vectors.rs

@@ -208,16 +208,7 @@ fn block_test_vectors_height_testnet() {
 /// Test that the block test vector indexes match the heights in the block data,
 /// and that each post-sapling block has a corresponding final sapling root.
 fn block_test_vectors_height(network: Network) {
-    let (block_iter, sapling_roots) = match network {
-        Mainnet => (
-            zebra_test::vectors::MAINNET_BLOCKS.iter(),
-            zebra_test::vectors::MAINNET_FINAL_SAPLING_ROOTS.clone(),
-        ),
-        Testnet => (
-            zebra_test::vectors::TESTNET_BLOCKS.iter(),
-            zebra_test::vectors::TESTNET_FINAL_SAPLING_ROOTS.clone(),
-        ),
-    };
+    let (block_iter, sapling_roots) = network.get_block_sapling_roots_iter();
 
     for (&height, block) in block_iter {
         let block = block
@@ -262,16 +253,7 @@ fn block_commitment_testnet() {
 ///
 /// TODO: add chain history test vectors?
 fn block_commitment(network: Network) {
-    let (block_iter, sapling_roots) = match network {
-        Mainnet => (
-            zebra_test::vectors::MAINNET_BLOCKS.iter(),
-            zebra_test::vectors::MAINNET_FINAL_SAPLING_ROOTS.clone(),
-        ),
-        Testnet => (
-            zebra_test::vectors::TESTNET_BLOCKS.iter(),
-            zebra_test::vectors::TESTNET_FINAL_SAPLING_ROOTS.clone(),
-        ),
-    };
+    let (block_iter, sapling_roots) = network.get_block_sapling_roots_iter();
 
     for (height, block) in block_iter {
         let block = block

zebra-chain/src/history_tree/tests/vectors.rs

@@ -13,9 +13,6 @@ use crate::{
 
 use color_eyre::eyre;
 use eyre::Result;
-use zebra_test::vectors::{
-    MAINNET_BLOCKS, MAINNET_FINAL_SAPLING_ROOTS, TESTNET_BLOCKS, TESTNET_FINAL_SAPLING_ROOTS,
-};
 
 /// Test the history tree using the activation block of a network upgrade
 /// and its next block.
@@ -36,10 +33,8 @@ fn push_and_prune_for_network_upgrade(
     network: Network,
     network_upgrade: NetworkUpgrade,
 ) -> Result<()> {
-    let (blocks, sapling_roots) = match network {
-        Network::Mainnet => (&*MAINNET_BLOCKS, &*MAINNET_FINAL_SAPLING_ROOTS),
-        Network::Testnet => (&*TESTNET_BLOCKS, &*TESTNET_FINAL_SAPLING_ROOTS),
-    };
+    let (blocks, sapling_roots) = network.get_block_sapling_roots_map();
+
     let height = network_upgrade.activation_height(network).unwrap().0;
 
     // Load first block (activation block of the given network upgrade)
@@ -120,10 +115,8 @@ fn upgrade() -> Result<()> {
 }
 
 fn upgrade_for_network_upgrade(network: Network, network_upgrade: NetworkUpgrade) -> Result<()> {
-    let (blocks, sapling_roots) = match network {
-        Network::Mainnet => (&*MAINNET_BLOCKS, &*MAINNET_FINAL_SAPLING_ROOTS),
-        Network::Testnet => (&*TESTNET_BLOCKS, &*TESTNET_FINAL_SAPLING_ROOTS),
-    };
+    let (blocks, sapling_roots) = network.get_block_sapling_roots_map();
+
     let height = network_upgrade.activation_height(network).unwrap().0;
 
     // Load previous block (the block before the activation block of the given network upgrade)

zebra-chain/src/lib.rs

@@ -43,6 +43,9 @@ pub mod work;
 #[cfg(any(test, feature = "proptest-impl"))]
 pub use block::LedgerState;
 
+#[cfg(any(test, feature = "proptest-impl"))]
+pub mod test_utils;
+
 /// Error type alias to make working with generic errors easier.
 ///
 /// Note: the 'static lifetime bound means that the *type* cannot have any

zebra-chain/src/primitives/zcash_history/tests/vectors.rs

@@ -6,9 +6,6 @@ use crate::{
 use crate::primitives::zcash_history::*;
 use color_eyre::eyre;
 use eyre::Result;
-use zebra_test::vectors::{
-    MAINNET_BLOCKS, MAINNET_FINAL_SAPLING_ROOTS, TESTNET_BLOCKS, TESTNET_FINAL_SAPLING_ROOTS,
-};
 
 /// Test the MMR tree using the activation block of a network upgrade
 /// and its next block.
@@ -22,10 +19,8 @@ fn tree() -> Result<()> {
 }
 
 fn tree_for_network_upgrade(network: Network, network_upgrade: NetworkUpgrade) -> Result<()> {
-    let (blocks, sapling_roots) = match network {
-        Network::Mainnet => (&*MAINNET_BLOCKS, &*MAINNET_FINAL_SAPLING_ROOTS),
-        Network::Testnet => (&*TESTNET_BLOCKS, &*TESTNET_FINAL_SAPLING_ROOTS),
-    };
+    let (blocks, sapling_roots) = network.get_block_sapling_roots_map();
+
     let height = network_upgrade.activation_height(network).unwrap().0;
 
     // Load Block 0 (activation block of the given network upgrade)

zebra-chain/src/sapling/tests/tree.rs

@@ -9,9 +9,6 @@ use crate::parameters::NetworkUpgrade;
 use crate::sapling::{self, tree::*};
 use crate::serialization::ZcashDeserializeInto;
 use crate::{parameters::Network, sapling::tests::test_vectors};
-use zebra_test::vectors::{
-    MAINNET_BLOCKS, MAINNET_FINAL_SAPLING_ROOTS, TESTNET_BLOCKS, TESTNET_FINAL_SAPLING_ROOTS,
-};
 
 #[test]
 fn empty_roots() {
@@ -60,10 +57,8 @@ fn incremental_roots_with_blocks() -> Result<()> {
 }
 
 fn incremental_roots_with_blocks_for_network(network: Network) -> Result<()> {
-    let (blocks, sapling_roots) = match network {
-        Network::Mainnet => (&*MAINNET_BLOCKS, &*MAINNET_FINAL_SAPLING_ROOTS),
-        Network::Testnet => (&*TESTNET_BLOCKS, &*TESTNET_FINAL_SAPLING_ROOTS),
-    };
+    let (blocks, sapling_roots) = network.get_block_sapling_roots_map();
+
     let height = NetworkUpgrade::Sapling
         .activation_height(network)
         .unwrap()

zebra-chain/src/serialization/error.rs

@@ -50,4 +50,20 @@ pub enum SerializationError {
     /// rule](https://zips.z.cash/protocol/protocol.pdf#txnencodingandconsensus).
     #[error("transaction balance is non-zero but doesn't have Sapling shielded spends or outputs")]
     BadTransactionBalance,
+
+    ///  Invalid height for BLOCK_MAINNET_******_BYTES
+    #[error("invalid mainnet height {{0}} requested, only 653_599 and 982_681 are available")]
+    NotACachedMainNetBlock(u32),
+
+    ///  Invalid height for BLOCK_TESTNET_******_BYTES
+    #[error("invalid testnet height {{0}} requested, only 583_999 and 925_483 are available")]
+    NotACachedTestNetBlock(u32),
+
+    /// Invalid sapling root mainnet bytes
+    #[error("invalid mainnet height {{0}} requested, only 1_046_400 is available")]
+    NotACachedMainNetSaplingRootBytes(u32),
+
+    /// Invalid sapling root testnet bytes
+    #[error("invalid testnet height {{0}} requested, only 1_116_000 is available")]
+    NotACachedTestNetSaplingRootBytes(u32),
 }

zebra-chain/src/sprout/tests/tree.rs

@@ -6,8 +6,6 @@ use color_eyre::eyre;
 use eyre::Result;
 use hex::FromHex;
 
-use zebra_test::vectors;
-
 use crate::{
     block::Block,
     parameters::{Network, NetworkUpgrade},
@@ -88,25 +86,8 @@ fn incremental_roots_with_blocks() -> Result<()> {
 }
 
 fn incremental_roots_with_blocks_for_network(network: Network) -> Result<()> {
-    // The mainnet block height at which the first JoinSplit occurred.
-    const MAINNET_FIRST_JOINSPLIT_HEIGHT: u32 = 396;
-
-    // The testnet block height at which the first JoinSplit occurred.
-    const TESTNET_FIRST_JOINSPLIT_HEIGHT: u32 = 2259;
-
     // Load the test data.
-    let (blocks, sprout_roots, next_height) = match network {
-        Network::Mainnet => (
-            &*vectors::MAINNET_BLOCKS,
-            &*vectors::MAINNET_FINAL_SPROUT_ROOTS,
-            MAINNET_FIRST_JOINSPLIT_HEIGHT,
-        ),
-        Network::Testnet => (
-            &*vectors::TESTNET_BLOCKS,
-            &*vectors::TESTNET_FINAL_SPROUT_ROOTS,
-            TESTNET_FIRST_JOINSPLIT_HEIGHT,
-        ),
-    };
+    let (blocks, sprout_roots, next_height) = network.get_block_sprout_roots_height();
 
     // Load the Genesis height.
     let genesis_height = NetworkUpgrade::Genesis

zebra-chain/src/test_utils.rs

@@ -0,0 +1,3 @@
+//!Chain functionality for fetching proptest vectors.
+//!
+mod vectors;