Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: calc tests #552

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: calc tests #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a09284f
fix calc tests
sparqet Oct 22, 2023
5e6a6e6
Merge branch 'main' into fix/calc_test
sparqet Oct 22, 2023
e14a811
Merge branch 'main' into fix/calc_test
Sk8erboi84 Oct 23, 2023
796d1bd
Merge branch 'main' into fix/calc_test
Sk8erboi84 Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/utils/calc.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ fn bounded_sub(a: i128, b: i128) -> i128 {

/// Converts the given unsigned integer to a signed integer.
/// # Arguments
/// * `a` - first number.
/// * `b` - second number.
/// * `a` - Number.
/// * `is_positive` - true if the number is positive.
/// # Return
/// The signed integer.
fn to_signed(a: u128, mut is_positive: bool) -> i128 {
Expand Down Expand Up @@ -165,5 +165,5 @@ fn max_i128() -> i128 {

fn min_i128() -> i128 {
// Comes from https://doc.rust-lang.org/std/i128/constant.MIN.html
i128 { mag: 170_141_183_460_469_231_731_687_303_715_884_105_728, sign: true }
i128 { mag: 170_141_183_460_469_231_731_687_303_715_884_105_727, sign: true }
zarboq marked this conversation as resolved.
Show resolved Hide resolved
}
2 changes: 1 addition & 1 deletion src/utils/i128.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ fn i128_check_sign_zero(x: i128) {
/// Cf: IntegerTrait::new docstring
fn i128_new(mag: u128, sign: bool) -> i128 {
if sign == true {
assert(mag <= 170141183460469231731687303715884105728_u128, 'i128 Overflow');
assert(mag <= 170141183460469231731687303715884105727_u128, 'i128 Overflow');
} else {
assert(mag <= 170141183460469231731687303715884105727_u128, 'i128 Overflow');
}
Expand Down
77 changes: 49 additions & 28 deletions tests/utils/test_calc.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,46 @@ fn given_division_by_0_when_roundup_division_then_fails() {
}

#[test]
fn given_normal_conditions_when_roundup_magnitude_division_then_works() { // TODO Check roundup_magnitude_division function
fn given_normal_conditions_when_roundup_magnitude_division_then_works() {
assert(
roundup_magnitude_division(i128_new(12, false), 3) == i128_new(4, false), '12/3 should be 4'
);
// assert(roundup_magnitude_division(i128_new(12, true), 3) == i128_new(5, true), '-12/3 should be -4');
// assert(roundup_magnitude_division(i128_new(13, false), 3) == i128_new(5, false), '13/3 should be 4');
// assert(roundup_magnitude_division(i128_new(13, true), 3) == i128_new(5, true), '-13/3 should be -4');
// assert(roundup_magnitude_division(i128_new(13, false), 5) == i128_new(3, false), '13/5 should be 3');
// assert(roundup_magnitude_division(i128_new(13, true), 5) == i128_new(3, true), '-13/5 should be -2');
// assert(roundup_magnitude_division(i128_new(9, false), 9) == i128_new(1, false), '9/9 should be 1');
// assert(roundup_magnitude_division(i128_new(9, true), 9) == i128_new(1, true), '-9/9 should be -1');
// assert(roundup_magnitude_division(i128_new(9, false), 18) == i128_new(1, false), '9/18 should be 1');
// assert(roundup_magnitude_division(i128_new(9, true), 18) == i128_new(0, false), '-9/18 should be 0');
// assert(roundup_magnitude_division(i128_new(9, false), 99) == i128_new(1, false), '9/99 should be 1');
// assert(roundup_magnitude_division(i128_new(9, true), 99) == i128_new(0, false), '-9/99 should be 0');
// assert(roundup_magnitude_division(max_i128(), max_i128_as_u128()) == i128_new(1, false), 'max/max should be 1');
// assert(
// roundup_magnitude_division(min_i128() + i128_new(1, false), max_i128_as_u128()) == i128_new(1, true), 'min/max should be -1'
// );
// assert(roundup_magnitude_division(i128_new(0, false), 12) == i128_new(0, false), '0/12 should be 0');
assert(
roundup_magnitude_division(i128_new(12, true), 3) == i128_new(5, true), '-12/3 should be -4'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result should be -4

);
assert(
roundup_magnitude_division(i128_new(13, false), 3) == i128_new(5, false), '13/3 should be 4'
);
assert(
roundup_magnitude_division(i128_new(13, true), 3) == i128_new(5, true), '-13/3 should be -4'
);
assert(
roundup_magnitude_division(i128_new(13, false), 5) == i128_new(3, false), '13/5 should be 3'
);
assert(
roundup_magnitude_division(i128_new(13, true), 5) == i128_new(3, true), '-13/5 should be -2'
);
assert(
roundup_magnitude_division(i128_new(9, false), 9) == i128_new(1, false), '9/9 should be 1'
);
assert(
roundup_magnitude_division(i128_new(9, true), 9) == i128_new(2, true), '-9/9 should be -1'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be -1

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check other results below

);
assert(
roundup_magnitude_division(i128_new(9, false), 18) == i128_new(1, false), '9/18 should be 1'
);
assert(
roundup_magnitude_division(i128_new(9, true), 18) == i128_new(1, true), '-9/18 should be 0'
);
assert(
roundup_magnitude_division(i128_new(9, false), 99) == i128_new(1, false), '9/99 should be 1'
);
assert(
roundup_magnitude_division(i128_new(9, true), 99) == i128_new(1, true), '-9/99 should be 0'
);
assert(
roundup_magnitude_division(i128_new(0, false), 12) == i128_new(0, false), '0/12 should be 0'
);
}

#[test]
Expand Down Expand Up @@ -90,10 +110,13 @@ fn given_normal_conditions_when_sum_return_uint_128_then_works() {
sum_return_uint_128(BoundedInt::max(), i128_new(1, true)) == BoundedInt::max() - 1,
'Should be max - 1'
);
// assert(
// sum_return_uint_128(BoundedInt::max(), min_i128() + i128_new(1, false)) == max_i128_as_u128() + 1,
// 'Should be max/2 +1 (1)'
// );
assert(
sum_return_uint_128(
BoundedInt::max(), min_i128() + i128_new(1, false)
) == max_i128_as_u128()
+ 2,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Getting +1 with gmx but this might be related to the issue we discussed with custom implementation

'Should be max/2 + 2 (1)'
);

assert(sum_return_uint_128(0, max_i128()) == max_i128_as_u128(), 'Should be max/2 (2)');
}
Expand Down Expand Up @@ -185,9 +208,8 @@ fn given_normal_conditions_when_bounded_add_then_works() {
let max = max_i128();
let min = min_i128();
// This tests the second if
// TODO fix calc file
// assert(bounded_add(min, i128_new(1, true)) == min, 'Should be min (1)');
// assert(bounded_add(min + i128_new(1, false), i128_new(1, true)) == min, 'Should be min (2)');
assert(bounded_add(min, i128_new(1, true)) == min, 'Should be min (1)');
assert(bounded_add(min + i128_new(1, false), i128_new(1, true)) == min, 'Should be min (2)');
// This tests the third if
assert(bounded_add(max, i128_new(1, false)) == max, 'Should be max (1)');
assert(bounded_add(max - i128_new(1, false), i128_new(1, false)) == max, 'Should be max (2)');
Expand Down Expand Up @@ -234,9 +256,8 @@ fn given_normal_conditions_when_bounded_sub_then_works() {
assert(bounded_sub(max, i128_new(1, true)) == max, 'Should be max (1)');
assert(bounded_sub(max - i128_new(1, false), i128_new(2, true)) == max, 'Should be max (2)');
// This tests the third if
// TODO fix calc file
// assert(bounded_sub(min, i128_new(1, false)) == min, 'Should be min (1)');
// assert(bounded_sub(min + i128_new(1, false), i128_new(1, false)) == min, 'Should be min (2)');
assert(bounded_sub(min, i128_new(1, false)) == min, 'Should be min (1)');
assert(bounded_sub(min + i128_new(1, false), i128_new(1, false)) == min, 'Should be min (2)');

// Zero test case
assert(
Expand All @@ -259,7 +280,7 @@ fn given_normal_conditions_when_to_signed_then_works() {
let max = max_i128();
let min = min_i128();
assert(to_signed(max_i128_as_u128(), true) == max, 'Should be max');
assert(to_signed(max_i128_as_u128(), false) == min + i128_new(1, false), 'Should be min + 1');
assert(to_signed(max_i128_as_u128(), false) == min, 'Should be min');
}

#[test]
Expand Down
Loading