Speedup proptests for Chain struct in zebra-state (#2012)

* Speedup proptests for Chain struct in zebra-state

* Add teor2345 requested changes

* Fix type for DEFAULT_PARTIAL_CHAIN_PROPTEST_CASES

* More costs for PROPTEST_CASES

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

@@ -9,6 +9,8 @@ use crate::{block, parameters::Network, LedgerState};
 
 use super::super::{serialize::MAX_BLOCK_BYTES, *};
 
+const DEFAULT_BLOCK_ROUNDTRIP_PROPTEST_CASES: u32 = 16;
+
 proptest! {
     #[test]
     fn block_hash_roundtrip(hash in any::<Hash>()) {
@@ -63,7 +65,7 @@ proptest! {
     #![proptest_config(Config::with_cases(env::var("PROPTEST_CASES")
                                           .ok()
                                           .and_then(|v| v.parse().ok())
-                                          .unwrap_or(16)))]
+                                          .unwrap_or(DEFAULT_BLOCK_ROUNDTRIP_PROPTEST_CASES)))]
 
     #[test]
     fn block_roundtrip(block in any::<Block>(), network in any::<Network>()) {

zebra-chain/src/work/tests/prop.rs

@@ -7,6 +7,8 @@ use crate::serialization::{ZcashDeserialize, ZcashDeserializeInto, ZcashSerializ
 
 use super::super::*;
 
+const DEFAULT_TEST_INPUT_PROPTEST_CASES: u32 = 64;
+
 #[test]
 fn equihash_solution_roundtrip() {
     zebra_test::init();
@@ -50,7 +52,7 @@ fn equihash_prop_test_solution() -> color_eyre::eyre::Result<()> {
         proptest!(Config::with_cases(env::var("PROPTEST_CASES")
                                       .ok()
                                       .and_then(|v| v.parse().ok())
-                                      .unwrap_or(64)),
+                                      .unwrap_or(DEFAULT_TEST_INPUT_PROPTEST_CASES)),
                 |(fake_header in randomized_solutions(block.header))| {
             fake_header.solution
                 .check(&fake_header)
@@ -121,7 +123,7 @@ fn equihash_prop_test_input() -> color_eyre::eyre::Result<()> {
         proptest!(Config::with_cases(env::var("PROPTEST_CASES")
                                   .ok()
                                   .and_then(|v| v.parse().ok())
-                                 .unwrap_or(64)),
+                                 .unwrap_or(DEFAULT_TEST_INPUT_PROPTEST_CASES)),
               |(fake_header in randomized_input(block.header))| {
             fake_header.solution
                 .check(&fake_header)

zebra-state/src/service/non_finalized_state/chain.rs

@@ -406,11 +406,15 @@ impl Ord for Chain {
 
 #[cfg(test)]
 mod tests {
+    use proptest::{
+        num::usize::BinarySearch,
+        strategy::{NewTree, ValueTree},
+        test_runner::TestRunner,
+    };
     use std::{env, sync::Arc};
 
     use zebra_chain::{
         block::Block,
-        fmt::SummaryDebug,
         parameters::{Network, NetworkUpgrade},
         serialization::ZcashDeserializeInto,
         LedgerState,
@@ -422,6 +426,9 @@ mod tests {
     use self::assert_eq;
     use super::*;
 
+    const MAX_PARTIAL_CHAIN_BLOCKS: usize = 100;
+    const DEFAULT_PARTIAL_CHAIN_PROPTEST_CASES: u32 = 32;
+
     #[test]
     fn construct_empty() {
         zebra_test::init();
@@ -486,16 +493,55 @@ mod tests {
         Ok(())
     }
 
-    fn arbitrary_chain(tip_height: block::Height) -> BoxedStrategy<Vec<Arc<Block>>> {
+    #[derive(Debug)]
-        Block::partial_chain_strategy(LedgerState::new(tip_height, Network::Mainnet), 100)
+    struct PreparedChainTree {
+        chain: Arc<Vec<PreparedBlock>>,
+        count: BinarySearch,
     }
 
-    prop_compose! {
+    impl ValueTree for PreparedChainTree {
-        fn arbitrary_chain_and_count()
+        type Value = (Arc<Vec<PreparedBlock>>, <BinarySearch as ValueTree>::Value);
-            (chain in arbitrary_chain(NetworkUpgrade::Blossom.activation_height(Network::Mainnet).unwrap()))
+
-            (count in 1..chain.len(), chain in Just(chain)) -> (SummaryDebug<Vec<Arc<Block>>>, usize)
+        fn current(&self) -> Self::Value {
-        {
+            (self.chain.clone(), self.count.current())
-            (SummaryDebug(chain), count)
+        }
+
+        fn simplify(&mut self) -> bool {
+            self.count.simplify()
+        }
+
+        fn complicate(&mut self) -> bool {
+            self.count.complicate()
+        }
+    }
+
+    #[derive(Debug, Default)]
+    struct PreparedChain {
+        // the proptests are threaded (not async), so we want to use a threaded mutex here
+        chain: std::sync::Mutex<Option<Arc<Vec<PreparedBlock>>>>,
+    }
+
+    impl Strategy for PreparedChain {
+        type Tree = PreparedChainTree;
+        type Value = <PreparedChainTree as ValueTree>::Value;
+
+        fn new_tree(&self, runner: &mut TestRunner) -> NewTree<Self> {
+            let mut chain = self.chain.lock().unwrap();
+            if chain.is_none() {
+                let tip_height = NetworkUpgrade::Canopy
+                    .activation_height(Network::Mainnet)
+                    .unwrap();
+                let ledger_state = LedgerState::new(tip_height, Network::Mainnet);
+                let blocks = Block::partial_chain_strategy(ledger_state, MAX_PARTIAL_CHAIN_BLOCKS)
+                    .prop_map(|vec| vec.into_iter().map(|blk| blk.prepare()).collect::<Vec<_>>())
+                    .new_tree(runner)?
+                    .current();
+                *chain = Some(Arc::new(blocks));
+            }
+
+            let chain = chain.clone().expect("should be generated");
+            let count = (1..chain.len()).new_tree(runner)?;
+            Ok(PreparedChainTree { chain, count })
         }
     }
 
@@ -506,25 +552,22 @@ mod tests {
         proptest!(ProptestConfig::with_cases(env::var("PROPTEST_CASES")
                                           .ok()
                                           .and_then(|v| v.parse().ok())
-                                          .unwrap_or(1)),
+                                          .unwrap_or(DEFAULT_PARTIAL_CHAIN_PROPTEST_CASES)),
-        |((chain, count) in arbitrary_chain_and_count())| {
+        |((chain, count) in PreparedChain::default())| {
-            let chain = chain.0;
+            let fork_tip_hash = chain[count - 1].hash;
-            let fork_tip_hash = chain[count - 1].hash();
             let mut full_chain = Chain::default();
             let mut partial_chain = Chain::default();
 
             for block in chain.iter().take(count) {
-                partial_chain.push(block.clone().prepare());
+                partial_chain.push(block.clone());
             }
-
+            for block in chain.iter() {
-            for block in chain {
+                full_chain.push(block.clone());
-                full_chain.push(block.prepare());
             }
 
             let forked = full_chain.fork(fork_tip_hash).expect("hash is present");
 
             prop_assert_eq!(forked.blocks.len(), partial_chain.blocks.len());
-
         });
 
         Ok(())
@@ -537,19 +580,17 @@ mod tests {
         proptest!(ProptestConfig::with_cases(env::var("PROPTEST_CASES")
                                           .ok()
                                           .and_then(|v| v.parse().ok())
-                                          .unwrap_or(1)),
+                                          .unwrap_or(DEFAULT_PARTIAL_CHAIN_PROPTEST_CASES)),
-        |((chain, end_count) in arbitrary_chain_and_count())| {
+        |((chain, end_count) in PreparedChain::default())| {
-            let chain = chain.0;
             let finalized_count = chain.len() - end_count;
             let mut full_chain = Chain::default();
             let mut partial_chain = Chain::default();
 
             for block in chain.iter().skip(finalized_count) {
-                partial_chain.push(block.clone().prepare());
+                partial_chain.push(block.clone());
             }
-
+            for block in chain.iter() {
-            for block in chain {
+                full_chain.push(block.clone());
-                full_chain.push(block.prepare());
             }
 
             for _ in 0..finalized_count {
@@ -557,7 +598,6 @@ mod tests {
             }
 
             prop_assert_eq!(full_chain.blocks.len(), partial_chain.blocks.len());
-
         });
 
         Ok(())