From 130c4e95e83352139c965676fd8d50adc4506906 Mon Sep 17 00:00:00 2001 From: Marek Date: Fri, 9 Feb 2024 02:54:54 +0100 Subject: [PATCH] Fix formatting in `proptest` macros (#8252) --- zebra-chain/src/work/tests/prop.rs | 24 ++++----- .../service/non_finalized_state/tests/prop.rs | 54 +++++++++---------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/zebra-chain/src/work/tests/prop.rs b/zebra-chain/src/work/tests/prop.rs index 6c3b4ae8a..f5bdf0109 100644 --- a/zebra-chain/src/work/tests/prop.rs +++ b/zebra-chain/src/work/tests/prop.rs @@ -18,15 +18,15 @@ fn equihash_solution_roundtrip() { let _init_guard = zebra_test::init(); proptest!(|(solution in any::())| { - let data = solution - .zcash_serialize_to_vec() - .expect("randomized EquihashSolution should serialize"); - let solution2 = data - .zcash_deserialize_into() - .expect("randomized EquihashSolution should deserialize"); + let data = solution + .zcash_serialize_to_vec() + .expect("randomized EquihashSolution should serialize"); + let solution2 = data + .zcash_deserialize_into() + .expect("randomized EquihashSolution should deserialize"); - prop_assert_eq![solution, solution2]; - }); + prop_assert_eq![solution, solution2]; + }); } prop_compose! { @@ -94,10 +94,10 @@ fn equihash_prop_test_nonce() -> color_eyre::eyre::Result<()> { block.header.solution.check(&block.header)?; proptest!(|(fake_header in randomized_nonce(*block.header.as_ref()))| { - fake_header.solution - .check(&fake_header) - .expect_err("block header should not validate on randomized nonce"); - }); + fake_header.solution + .check(&fake_header) + .expect_err("block header should not validate on randomized nonce"); + }); } Ok(()) diff --git a/zebra-state/src/service/non_finalized_state/tests/prop.rs b/zebra-state/src/service/non_finalized_state/tests/prop.rs index b7a3e5b00..d40b83137 100644 --- a/zebra-state/src/service/non_finalized_state/tests/prop.rs +++ b/zebra-state/src/service/non_finalized_state/tests/prop.rs @@ -40,40 +40,40 @@ fn push_genesis_chain() -> Result<()> { let _init_guard = zebra_test::init(); proptest!( - ProptestConfig::with_cases(env::var("PROPTEST_CASES") - .ok() - .and_then(|v| v.parse().ok()) - .unwrap_or(DEFAULT_PARTIAL_CHAIN_PROPTEST_CASES)), - |((chain, count, network, empty_tree) in PreparedChain::default())| { - prop_assert!(empty_tree.is_none()); + ProptestConfig::with_cases(env::var("PROPTEST_CASES") + .ok() + .and_then(|v| v.parse().ok()) + .unwrap_or(DEFAULT_PARTIAL_CHAIN_PROPTEST_CASES)), + |((chain, count, network, empty_tree) in PreparedChain::default())| { + prop_assert!(empty_tree.is_none()); - let mut only_chain = Chain::new(network, Height(0), Default::default(), Default::default(), Default::default(), empty_tree, ValueBalance::zero()); - // contains the block value pool changes and chain value pool balances for each height - let mut chain_values = BTreeMap::new(); + let mut only_chain = Chain::new(network, Height(0), Default::default(), Default::default(), Default::default(), empty_tree, ValueBalance::zero()); + // contains the block value pool changes and chain value pool balances for each height + let mut chain_values = BTreeMap::new(); - chain_values.insert(None, (None, only_chain.chain_value_pools.into())); + chain_values.insert(None, (None, only_chain.chain_value_pools.into())); - for block in chain.iter().take(count).skip(1).cloned() { - let block = - ContextuallyVerifiedBlock::with_block_and_spent_utxos( - block, - only_chain.unspent_utxos(), - ) - .map_err(|e| (e, chain_values.clone())) - .expect("invalid block value pool change"); + for block in chain.iter().take(count).skip(1).cloned() { + let block = + ContextuallyVerifiedBlock::with_block_and_spent_utxos( + block, + only_chain.unspent_utxos(), + ) + .map_err(|e| (e, chain_values.clone())) + .expect("invalid block value pool change"); - chain_values.insert(block.height.into(), (block.chain_value_pool_change.into(), None)); + chain_values.insert(block.height.into(), (block.chain_value_pool_change.into(), None)); - only_chain = only_chain - .push(block.clone()) - .map_err(|e| (e, chain_values.clone())) - .expect("invalid chain value pools"); + only_chain = only_chain + .push(block.clone()) + .map_err(|e| (e, chain_values.clone())) + .expect("invalid chain value pools"); - chain_values.insert(block.height.into(), (block.chain_value_pool_change.into(), only_chain.chain_value_pools.into())); - } + chain_values.insert(block.height.into(), (block.chain_value_pool_change.into(), only_chain.chain_value_pools.into())); + } - prop_assert_eq!(only_chain.blocks.len(), count - 1); - }); + prop_assert_eq!(only_chain.blocks.len(), count - 1); + }); Ok(()) }