return BlstError!bool for mergeAndVerify

Author: spiral-ladder

src/ThreadPool.zig

@@ -343,7 +343,7 @@ pub fn aggregateVerify(
 /// Merges all of `pool`'s `pairing_bufs` and execute `finalVerify` on the accumulated `acc`.
 ///
 /// Perform final verification of `gtsig`, returning `false` if verification fails.
-fn mergeAndVerify(pool: *ThreadPool, n_active: usize, gtsig: ?*const c.blst_fp12) bool {
+fn mergeAndVerify(pool: *ThreadPool, n_active: usize, gtsig: ?*const c.blst_fp12) BlstError!bool {
     var acc_idx: ?usize = null;
     for (0..n_active) |i| {
         if (pool.has_work[i]) {
@@ -352,13 +352,13 @@ fn mergeAndVerify(pool: *ThreadPool, n_active: usize, gtsig: ?*const c.blst_fp12
         }
     }
 
-    const first = acc_idx orelse return false;
+    const first = acc_idx orelse return BlstError.MergeError;
     var acc = Pairing{ .ctx = @ptrCast(&pool.pairing_bufs[first].data) };
 
     for (first + 1..n_active) |i| {
         if (pool.has_work[i]) {
             const other = Pairing{ .ctx = @ptrCast(&pool.pairing_bufs[i].data) };
-            acc.merge(&other) catch return false;
+            try acc.merge(&other);
         }
     }
 

src/error.zig

@@ -10,6 +10,7 @@ pub const BlstError = error{
     VerifyFail,
     PkIsInfinity,
     BadScalar,
+    MergeError,
 };
 
 pub fn intFromError(e: BlstError) c_uint {
@@ -21,6 +22,7 @@ pub fn intFromError(e: BlstError) c_uint {
         BlstError.VerifyFail => c.BLST_VERIFY_FAIL,
         BlstError.PkIsInfinity => c.BLST_PK_IS_INFINITY,
         BlstError.BadScalar => c.BLST_BAD_SCALAR,
+        BlstError.MergeError => c.BLST_BAD_SCALAR + 1,
     };
 }