From 5b55813901227e1613a87a9c0ea9f1a07454896a Mon Sep 17 00:00:00 2001 From: arya2 Date: Thu, 12 Oct 2023 23:30:09 -0400 Subject: [PATCH] updates vectors tests --- zebra-state/src/service/read/tests/vectors.rs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/zebra-state/src/service/read/tests/vectors.rs b/zebra-state/src/service/read/tests/vectors.rs index 2ac96578cc7..cfe9274b2a7 100644 --- a/zebra-state/src/service/read/tests/vectors.rs +++ b/zebra-state/src/service/read/tests/vectors.rs @@ -124,40 +124,40 @@ async fn test_sapling_subtrees() -> Result<()> { // the non-finalized state. // Retrieve only the first subtree and check its properties. - let subtrees = sapling_subtrees(chain.clone(), &db, 0.into(), Some(1.into())); + let subtrees = sapling_subtrees(chain.clone(), &db, NoteCommitmentSubtreeIndex(0)..1.into()); let mut subtrees = subtrees.iter(); assert_eq!(subtrees.len(), 1); assert!(subtrees_eq(subtrees.next().unwrap(), &db_subtree)); // Retrieve both subtrees using a limit and check their properties. - let subtrees = sapling_subtrees(chain.clone(), &db, 0.into(), Some(2.into())); + let subtrees = sapling_subtrees(chain.clone(), &db, NoteCommitmentSubtreeIndex(0)..2.into()); let mut subtrees = subtrees.iter(); assert_eq!(subtrees.len(), 2); assert!(subtrees_eq(subtrees.next().unwrap(), &db_subtree)); assert!(subtrees_eq(subtrees.next().unwrap(), &chain_subtree)); // Retrieve both subtrees without using a limit and check their properties. - let subtrees = sapling_subtrees(chain.clone(), &db, 0.into(), None); + let subtrees = sapling_subtrees(chain.clone(), &db, NoteCommitmentSubtreeIndex(0)..); let mut subtrees = subtrees.iter(); assert_eq!(subtrees.len(), 2); assert!(subtrees_eq(subtrees.next().unwrap(), &db_subtree)); assert!(subtrees_eq(subtrees.next().unwrap(), &chain_subtree)); // Retrieve only the second subtree and check its properties. - let subtrees = sapling_subtrees(chain.clone(), &db, 1.into(), Some(1.into())); + let subtrees = sapling_subtrees(chain.clone(), &db, NoteCommitmentSubtreeIndex(1)..2.into()); let mut subtrees = subtrees.iter(); assert_eq!(subtrees.len(), 1); assert!(subtrees_eq(subtrees.next().unwrap(), &chain_subtree)); // Retrieve only the second subtree, using a limit that would allow for more trees if they were // present, and check its properties. - let subtrees = sapling_subtrees(chain.clone(), &db, 1.into(), Some(2.into())); + let subtrees = sapling_subtrees(chain.clone(), &db, NoteCommitmentSubtreeIndex(1)..3.into()); let mut subtrees = subtrees.iter(); assert_eq!(subtrees.len(), 1); assert!(subtrees_eq(subtrees.next().unwrap(), &chain_subtree)); // Retrieve only the second subtree, without using any limit, and check its properties. - let subtrees = sapling_subtrees(chain, &db, 1.into(), None); + let subtrees = sapling_subtrees(chain, &db, NoteCommitmentSubtreeIndex(1)..); let mut subtrees = subtrees.iter(); assert_eq!(subtrees.len(), 1); assert!(subtrees_eq(subtrees.next().unwrap(), &chain_subtree)); @@ -189,40 +189,40 @@ async fn test_orchard_subtrees() -> Result<()> { // the non-finalized state. // Retrieve only the first subtree and check its properties. - let subtrees = orchard_subtrees(chain.clone(), &db, 0.into(), Some(1.into())); + let subtrees = orchard_subtrees(chain.clone(), &db, NoteCommitmentSubtreeIndex(0)..1.into()); let mut subtrees = subtrees.iter(); assert_eq!(subtrees.len(), 1); assert!(subtrees_eq(subtrees.next().unwrap(), &db_subtree)); // Retrieve both subtrees using a limit and check their properties. - let subtrees = orchard_subtrees(chain.clone(), &db, 0.into(), Some(2.into())); + let subtrees = orchard_subtrees(chain.clone(), &db, NoteCommitmentSubtreeIndex(0)..2.into()); let mut subtrees = subtrees.iter(); assert_eq!(subtrees.len(), 2); assert!(subtrees_eq(subtrees.next().unwrap(), &db_subtree)); assert!(subtrees_eq(subtrees.next().unwrap(), &chain_subtree)); // Retrieve both subtrees without using a limit and check their properties. - let subtrees = orchard_subtrees(chain.clone(), &db, 0.into(), None); + let subtrees = orchard_subtrees(chain.clone(), &db, NoteCommitmentSubtreeIndex(0)..); let mut subtrees = subtrees.iter(); assert_eq!(subtrees.len(), 2); assert!(subtrees_eq(subtrees.next().unwrap(), &db_subtree)); assert!(subtrees_eq(subtrees.next().unwrap(), &chain_subtree)); // Retrieve only the second subtree and check its properties. - let subtrees = orchard_subtrees(chain.clone(), &db, 1.into(), Some(1.into())); + let subtrees = orchard_subtrees(chain.clone(), &db, NoteCommitmentSubtreeIndex(1)..2.into()); let mut subtrees = subtrees.iter(); assert_eq!(subtrees.len(), 1); assert!(subtrees_eq(subtrees.next().unwrap(), &chain_subtree)); // Retrieve only the second subtree, using a limit that would allow for more trees if they were // present, and check its properties. - let subtrees = orchard_subtrees(chain.clone(), &db, 1.into(), Some(2.into())); + let subtrees = orchard_subtrees(chain.clone(), &db, NoteCommitmentSubtreeIndex(1)..3.into()); let mut subtrees = subtrees.iter(); assert_eq!(subtrees.len(), 1); assert!(subtrees_eq(subtrees.next().unwrap(), &chain_subtree)); // Retrieve only the second subtree, without using any limit, and check its properties. - let subtrees = orchard_subtrees(chain, &db, 1.into(), None); + let subtrees = orchard_subtrees(chain, &db, NoteCommitmentSubtreeIndex(1)..); let mut subtrees = subtrees.iter(); assert_eq!(subtrees.len(), 1); assert!(subtrees_eq(subtrees.next().unwrap(), &chain_subtree));