From 5c9b8416897f7fdc343630f4765c68f68f140fbd Mon Sep 17 00:00:00 2001
From: Tom French <tom@tomfren.ch>
Date: Mon, 26 Feb 2024 20:18:06 +0000
Subject: [PATCH] chore: fix some tests

---
 .../src/main.nr                               | 14 ++++----
 .../src/main.nr                               | 34 ++++++++++---------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/test_programs/compile_success_empty/brillig_field_binary_operations/src/main.nr b/test_programs/compile_success_empty/brillig_field_binary_operations/src/main.nr
index 0c22297b8b4..fedfe48cb0d 100644
--- a/test_programs/compile_success_empty/brillig_field_binary_operations/src/main.nr
+++ b/test_programs/compile_success_empty/brillig_field_binary_operations/src/main.nr
@@ -1,11 +1,13 @@
 // Tests arithmetic operations on fields
 fn main() {
-    let x = 4;
-    let y = 2;
-    assert((x + y) == unsafe { add(x, y) });
-    assert((x - y) == unsafe { sub(x, y) });
-    assert((x * y) == unsafe { mul(x, y) });
-    assert((x / y) == unsafe { div(x, y) });
+    unsafe {
+        let x = 4;
+        let y = 2;
+        assert((x + y) == add(x, y));
+        assert((x - y) == sub(x, y));
+        assert((x * y) == mul(x, y));
+        assert((x / y) == div(x, y));
+    }
 }
 
 unconstrained fn add(x: Field, y: Field) -> Field {
diff --git a/test_programs/compile_success_empty/brillig_integer_binary_operations/src/main.nr b/test_programs/compile_success_empty/brillig_integer_binary_operations/src/main.nr
index b1837a91c12..ee8eb9b3518 100644
--- a/test_programs/compile_success_empty/brillig_integer_binary_operations/src/main.nr
+++ b/test_programs/compile_success_empty/brillig_integer_binary_operations/src/main.nr
@@ -3,28 +3,30 @@ fn main() {
     let x: u32 = 6;
     let y: u32 = 2;
 
-    assert((x + y) == unsafe { add(x, y) });
+    unsafe {
+        assert((x + y) == add(x, y));
 
-    assert((x - y) == unsafe { sub(x, y) });
+        assert((x - y) == sub(x, y));
 
-    assert((x * y) == unsafe { mul(x, y) });
+        assert((x * y) == mul(x, y));
 
-    assert((x / y) == unsafe { div(x, y) });
-    // TODO SSA => ACIR has some issues with i32 ops
-    assert(unsafe { check_signed_div(6, 2, 3)});
+        assert((x / y) == div(x, y));
+        // TODO SSA => ACIR has some issues with i32 ops
+        assert(check_signed_div(6, 2, 3));
 
-    assert(unsafe { eq(1, 2) } == false);
-    assert(unsafe { eq(1, 1) });
+        assert(eq(1, 2) == false);
+        assert(eq(1, 1));
 
-    assert(unsafe { lt(x, y) } == false);
-    assert(unsafe { lt(y, x) });
+        assert(lt(x, y) == false);
+        assert(lt(y, x));
 
-    assert((x & y) == unsafe { and(x, y) });
-    assert((x | y) == unsafe { or(x, y) });
-    // TODO SSA => ACIR has some issues with xor ops
-    assert(unsafe { check_xor(x, y, 4) });
-    assert((x >> y) == unsafe { shr(x, y) });
-    assert((x << y) == unsafe { shl(x, y) });
+        assert((x & y) == and(x, y));
+        assert((x | y) == or(x, y));
+        // TODO SSA => ACIR has some issues with xor ops
+        assert(check_xor(x, y, 4));
+        assert((x >> y) == shr(x, y));
+        assert((x << y) == shl(x, y));
+    }
 }
 
 unconstrained fn add(x: u32, y: u32) -> u32 {