fix: tests

Author: ananas-block

src/api/method/get_validity_proof/common.rs

@@ -75,7 +75,7 @@ pub struct GetValidityProofResponse {
     pub context: Context,
 }
 
-#[derive(Serialize, Deserialize, Default, ToSchema)]
+#[derive(Serialize, Deserialize, Default, ToSchema, Debug)]
 #[serde(deny_unknown_fields, rename_all = "camelCase")]
 pub struct GetValidityProofResponseV2 {
     pub value: CompressedProofWithContextV2,
@@ -88,7 +88,15 @@ impl From<GetValidityProofResponse> for GetValidityProofResponseV2 {
             value: CompressedProofWithContextV2 {
                 compressedProof: response.value.compressedProof,
                 roots: response.value.roots,
-                rootIndices: response.value.rootIndices.into_iter().map(|x| RootIndex { root_index: x, in_tree: true}).collect(),
+                rootIndices: response
+                    .value
+                    .rootIndices
+                    .into_iter()
+                    .map(|x| RootIndex {
+                        root_index: x,
+                        in_tree: true,
+                    })
+                    .collect(),
                 leafIndices: response.value.leafIndices,
                 leaves: response.value.leaves,
                 merkleTrees: response.value.merkleTrees,

tests/integration_tests/batched_state_tree_tests.rs

@@ -188,7 +188,7 @@ async fn test_batched_tree_transactions(
         println!("i {}, validity_proof {:?}", i, validity_proof.value);
 
         // No value has been inserted into the tree yet -> all proof by index.
-        assert!(validity_proof.value.rootIndices.iter().all(|x| x.is_none()));
+        assert!(validity_proof.value.rootIndices.iter().all(|x| !x.in_tree));
         assert!(validity_proof
             .value
             .merkleTrees
@@ -366,9 +366,9 @@ async fn test_batched_tree_transactions(
                 println!("z + base index {} {}", z, base_index);
                 println!("last inserted index {}", last_inserted_index);
                 if base_index < last_inserted_index {
-                    assert!(root_index.is_some());
+                    assert!(root_index.in_tree);
                 } else {
-                    assert!(root_index.is_none());
+                    assert!(!root_index.in_tree);
                     assert_eq!(root, "");
                 }
                 base_index += 2;