chore: adapt to MMR::verify() return value change

Adapts tasm-lib to a breaking change in twenty-first 2a331dd3267f53d04b3669d47eb0b54f04092e54
TritonVM · Apr 19, 2024 · 9478e0d · 9478e0d
1 parent 4bf531f
commit 9478e0d
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 35 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,3 +43,7 @@ lto = false
 incremental = false
 codegen-units = 16
 rpath = false
+
+[patch.crates-io]
+# 2a331dd3267f53d04b3669d47eb0b54f04092e54 = tip of branch: master,  on 2024-04-22
+twenty-first = { git = "https://github.com/Neptune-Crypto/twenty-first.git", rev = "2a331dd3267f53d04b3669d47eb0b54f04092e54" }
diff --git a/tasm-lib/benchmarks/tasmlib_verifier_stark_verify_inner_padded_height_256_fri_exp_4.json b/tasm-lib/benchmarks/tasmlib_verifier_stark_verify_inner_padded_height_256_fri_exp_4.json
@@ -4,7 +4,7 @@
     "benchmark_result": {
       "clock_cycle_count": 1193994,
       "hash_table_height": 181747,
-      "u32_table_height": 45892,
+      "u32_table_height": 45831,
       "op_stack_table_height": 1637760,
       "ram_table_height": 513214
     },

diff --git a/tasm-lib/benchmarks/tasmlib_verifier_stark_verify_inner_padded_height_512_fri_exp_4.json b/tasm-lib/benchmarks/tasmlib_verifier_stark_verify_inner_padded_height_512_fri_exp_4.json
@@ -4,7 +4,7 @@
     "benchmark_result": {
       "clock_cycle_count": 1221657,
       "hash_table_height": 190879,
-      "u32_table_height": 51192,
+      "u32_table_height": 51038,
       "op_stack_table_height": 1675318,
       "ram_table_height": 516821
     },

diff --git a/tasm-lib/src/mmr/calculate_new_peaks_from_append.rs b/tasm-lib/src/mmr/calculate_new_peaks_from_append.rs
@@ -504,13 +504,11 @@ mod tests {
             _hasher: std::marker::PhantomData,
         };
         assert!(
-            produced_mp
-                .verify(
-                    &produced_mmr.get_peaks(),
-                    new_leaf,
-                    produced_mmr.count_leaves(),
-                )
-                .0,
+            produced_mp.verify(
+                &produced_mmr.get_peaks(),
+                new_leaf,
+                produced_mmr.count_leaves(),
+            ),
             "TASM-produced authentication path must be valid"
         );
     }

diff --git a/tasm-lib/src/mmr/calculate_new_peaks_from_leaf_mutation.rs b/tasm-lib/src/mmr/calculate_new_peaks_from_leaf_mutation.rs
@@ -569,29 +569,23 @@ mod tests {
             _hasher: std::marker::PhantomData,
         };
         assert!(
-            mmr_mp
-                .verify(
-                    &produced_mmr.get_peaks(),
-                    new_leaf,
-                    produced_mmr.count_leaves(),
-                )
-                .0,
+            mmr_mp.verify(
+                &produced_mmr.get_peaks(),
+                new_leaf,
+                produced_mmr.count_leaves(),
+            ),
             "TASM-produced authentication path must be valid"
         );
 
         // Extra checks because paranoia
         let mut expected_final_mmra_double_check = start_mmr.to_accumulator();
         expected_final_mmra_double_check.mutate_leaf(&mmr_mp, new_leaf);
         assert_eq!(expected_final_mmra_double_check, produced_mmr);
-        assert!(
-            mmr_mp
-                .verify(
-                    &expected_final_mmra_double_check.get_peaks(),
-                    new_leaf,
-                    expected_final_mmra_double_check.count_leaves()
-                )
-                .0
-        );
+        assert!(mmr_mp.verify(
+            &expected_final_mmra_double_check.get_peaks(),
+            new_leaf,
+            expected_final_mmra_double_check.count_leaves()
+        ));
     }
 }
 

diff --git a/tasm-lib/src/mmr/verify_from_memory.rs b/tasm-lib/src/mmr/verify_from_memory.rs
@@ -361,9 +361,11 @@ impl DeprecatedSnippet for MmrVerifyFromMemory {
             peaks.push(digest);
         }
 
-        let valid_mp = MmrMembershipProof::<VmHasher>::new(leaf_index, auth_path)
-            .verify(&peaks, leaf_digest, leaf_count)
-            .0;
+        let valid_mp = MmrMembershipProof::<VmHasher>::new(leaf_index, auth_path).verify(
+            &peaks,
+            leaf_digest,
+            leaf_count,
+        );
 
         stack.push(auth_path_pointer);
         stack.push(BFieldElement::new(leaf_index_hi as u64));
@@ -584,9 +586,11 @@ mod tests {
         // Verify that auth path expectation was correct
         assert_eq!(
             expect_validation_success,
-            MmrMembershipProof::<H>::new(leaf_index, auth_path)
-                .verify(&mmr.get_peaks(), leaf, mmr.count_leaves())
-                .0
+            MmrMembershipProof::<H>::new(leaf_index, auth_path).verify(
+                &mmr.get_peaks(),
+                leaf,
+                mmr.count_leaves()
+            )
         );
     }
 }

diff --git a/tasm-lib/src/mmr/verify_from_secret_in.rs b/tasm-lib/src/mmr/verify_from_secret_in.rs
@@ -292,7 +292,7 @@ impl Procedure for MmrVerifyLeafMembershipFromSecretIn {
             i += 1;
         }
 
-        let (valid_mp, _) = MmrMembershipProof::<VmHasher>::new(leaf_index, auth_path).verify(
+        let valid_mp = MmrMembershipProof::<VmHasher>::new(leaf_index, auth_path).verify(
             &peaks,
             leaf_digest,
             leaf_count,
@@ -562,9 +562,11 @@ mod tests {
         // Sanity check
         assert_eq!(
             expect_validation_success,
-            MmrMembershipProof::<H>::new(leaf_index, auth_path)
-                .verify(&mmr.get_peaks(), leaf, leaf_count)
-                .0
+            MmrMembershipProof::<H>::new(leaf_index, auth_path).verify(
+                &mmr.get_peaks(),
+                leaf,
+                leaf_count
+            )
         );
     }
 }