From cb1f1ece1fd050b00ad8cbe9086e76383f9e6377 Mon Sep 17 00:00:00 2001 From: Lasse Herskind <16536249+LHerskind@users.noreply.github.com> Date: Tue, 5 Sep 2023 12:01:47 +0100 Subject: [PATCH] test: Add safemath noir testing (#1967) Fixes #1965 with should fail test cases. Should be redone with complete failure messages when https://github.com/noir-lang/noir/pull/2541 is ready. --- .../noir-libs/safe-math/src/safe_u120.nr | 246 +++++++++++++++--- 1 file changed, 217 insertions(+), 29 deletions(-) diff --git a/yarn-project/noir-libs/safe-math/src/safe_u120.nr b/yarn-project/noir-libs/safe-math/src/safe_u120.nr index 1778a15f312..ce97afe821b 100644 --- a/yarn-project/noir-libs/safe-math/src/safe_u120.nr +++ b/yarn-project/noir-libs/safe-math/src/safe_u120.nr @@ -3,80 +3,268 @@ struct SafeU120 { } impl SafeU120 { + fn min() -> Self { + Self { + value: 0 + } + } + + fn max() -> Self { + Self { + value: 0xffffffffffffffffffffffffffffff + } + } + + fn new( + value: Field, + ) -> Self { + // Check that it actually will fit. Spending a lot of constraints here :grimacing: + let bytes = value.to_be_bytes(32); + for i in 0..17 { + assert(bytes[i] == 0); + } + Self { + value: value as u120 + } + } + fn is_zero( self: Self, ) -> bool { self.value == 0 } + fn eq( + self: Self, + other: Self + ) -> bool { + self.value == other.value + } + fn sub( self: Self, - b: SafeU120, - ) -> SafeU120 { + b: Self, + ) -> Self { assert(self.value >= b.value); - SafeU120 { + Self { value: self.value - b.value } } fn add( self: Self, - b: SafeU120, - ) -> SafeU120 { + b: Self, + ) -> Self { let c: u120 = self.value + b.value; assert(c >= self.value); - SafeU120 { + Self { value: c } } fn mul( self: Self, - b: SafeU120, - ) -> SafeU120 { + b: Self, + ) -> Self { let c: u120 = self.value * b.value; - if b.value > 0 { + if !b.is_zero() { assert(c / b.value == self.value); } - SafeU120 { + Self { value: c } } fn div( self: Self, - b: SafeU120, - ) -> SafeU120 { - assert(b.value != 0); - SafeU120 { + b: Self, + ) -> Self { + assert(!b.is_zero()); + Self { value: self.value / b.value } } fn mul_div( self: Self, - b: SafeU120, - divisor: SafeU120 - ) -> SafeU120 { - let c = SafeU120::mul(self, b); - SafeU120 { - value: c.value / divisor.value - } + b: Self, + divisor: Self + ) -> Self { + self.mul(b).div(divisor) } fn mul_div_up( self: Self, - b: SafeU120, - divisor: SafeU120 - ) -> SafeU120 { - let c = SafeU120::mul(self, b); + b: Self, + divisor: Self + ) -> Self { + let c = self.mul(b); + assert(!divisor.is_zero()); let adder = ((self.value * b.value % divisor.value) as u120 > 0) as u120; - SafeU120 { - value: c.value / divisor.value + adder - } + c.div(divisor).add(Self {value: adder}) } // todo: implement mul_div with 240 bit intermediate values. } -// Adding test in here is pretty useless as long as noir don't support failings tests. \ No newline at end of file +#[test] +fn test_init() { + let a = SafeU120::new(1); + assert(a.value == 1); +} + +#[test] +fn test_init_max() { + let a = SafeU120::max(); + assert(a.value == 0xffffffffffffffffffffffffffffff); +} + +#[test] +fn test_init_min() { + let a = SafeU120::min(); + assert(a.value == 0); +} + +#[test] +fn test_is_zero() { + let a = SafeU120::min(); + assert(a.value == 0); + assert(a.is_zero() == true); +} + +#[test] +fn test_eq() { + let a = SafeU120::new(1); + let b = SafeU120::new(1); + assert(a.eq(b)); +} + +#[test(should_fail)] +fn test_init_too_large() { + let b = SafeU120::max().value as Field + 1; // max + 1 + let _a = SafeU120::new(b); +} + +#[test] +fn test_add() { + let a = SafeU120::new(1); + let b = SafeU120::new(2); + let c = SafeU120::add(a, b); + assert(c.value == 3); +} + +#[test(should_fail)] +fn test_add_overflow() { + let a = SafeU120::max(); + let b = SafeU120::new(1); + let _c = SafeU120::add(a, b); +} + +#[test] +fn test_sub() { + let a = SafeU120::new(2); + let b = SafeU120::new(1); + let c = SafeU120::sub(a, b); + assert(c.value == 1); +} + +#[test(should_fail)] +fn test_sub_underflow() { + let a = SafeU120::new(1); + let b = SafeU120::new(2); + let _c = SafeU120::sub(a, b); +} + +#[test] +fn test_mul() { + let a = SafeU120::new(2); + let b = SafeU120::new(3); + let c = SafeU120::mul(a, b); + assert(c.value == 6); +} + +#[test(should_fail)] +fn test_mul_overflow() { + let a = SafeU120::max(); + let b = SafeU120::new(2); + let _c = SafeU120::mul(a, b); +} + +#[test] +fn test_div() { + let a = SafeU120::new(6); + let b = SafeU120::new(3); + let c = SafeU120::div(a, b); + assert(c.value == 2); +} + +#[test(should_fail)] +fn test_div_by_zero() { + let a = SafeU120::new(6); + let b = SafeU120::new(0); + let _c = SafeU120::div(a, b); +} + +#[test] +fn test_mul_div() { + let a = SafeU120::new(6); + let b = SafeU120::new(3); + let c = SafeU120::new(2); + let d = SafeU120::mul_div(a, b, c); + assert(d.value == 9); +} + +#[test(should_fail)] +fn test_mul_div_zero_divisor() { + let a = SafeU120::new(6); + let b = SafeU120::new(3); + let c = SafeU120::new(0); + let _d = SafeU120::mul_div(a, b, c); +} + +#[test(should_fail)] +fn test_mul_div_ghost_overflow() { + let a = SafeU120::max(); + let b = SafeU120::new(2); + let c = SafeU120::new(4); + let _d = SafeU120::mul_div(a, b, c); +} + +#[test] +fn test_mul_div_up_rounding() { + let a = SafeU120::new(6); + let b = SafeU120::new(3); + let c = SafeU120::new(5); + let d = SafeU120::mul_div_up(a, b, c); + assert(d.value == 4); +} + +#[test] +fn test_mul_div_up_non_rounding() { + let a = SafeU120::new(6); + let b = SafeU120::new(3); + let c = SafeU120::new(2); + let d = SafeU120::mul_div_up(a, b, c); + assert(d.value == 9); +} + + +#[test(should_fail)] +fn test_mul_div_up_ghost_overflow() { + let a = SafeU120::max(); + let b = SafeU120::new(2); + let c = SafeU120::new(9); + let _d = SafeU120::mul_div_up(a, b, c); +} + +// It should not be possible for us to overflow `mul_div_up` through the adder, since that require the divisor to be 1 +// since we otherwise would not be at the max value. If divisor is 1, adder is 0. + +// See https://github.com/AztecProtocol/aztec-packages/issues/2000 +//#[test(should_fail)] +//fn test_mul_div_up_zero_divisor() { +// let a = SafeU120::new(6); +// let b = SafeU120::new(3); +// let c = SafeU120::new(0); +// let _d = SafeU120::mul_div_up(a, b, c); +//} \ No newline at end of file