From b886930a9068c41c79c2ce1cc889161ae75586c7 Mon Sep 17 00:00:00 2001 From: Alessandro Coglio Date: Fri, 27 Oct 2023 13:17:25 -0700 Subject: [PATCH] Update constraint counts. --- .../src/data/literal/cast_lossy/field.rs | 12 +- .../src/data/literal/cast_lossy/integer.rs | 120 +++++++++--------- .../src/data/literal/cast_lossy/scalar.rs | 12 +- 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/circuit/program/src/data/literal/cast_lossy/field.rs b/circuit/program/src/data/literal/cast_lossy/field.rs index 9763f1039b..e9e7e054d6 100644 --- a/circuit/program/src/data/literal/cast_lossy/field.rs +++ b/circuit/program/src/data/literal/cast_lossy/field.rs @@ -145,15 +145,15 @@ mod tests { fn test_field_to_address() { check_cast_lossy::, console_root::types::Address>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Address>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Address>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -184,15 +184,15 @@ mod tests { fn test_field_to_group() { check_cast_lossy::, console_root::types::Group>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Group>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Group>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } diff --git a/circuit/program/src/data/literal/cast_lossy/integer.rs b/circuit/program/src/data/literal/cast_lossy/integer.rs index 4531e0e504..7d2244c7ff 100644 --- a/circuit/program/src/data/literal/cast_lossy/integer.rs +++ b/circuit/program/src/data/literal/cast_lossy/integer.rs @@ -130,15 +130,15 @@ mod tests { fn test_i8_to_address() { check_cast_lossy::, console_root::types::Address>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Address>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Address>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -178,15 +178,15 @@ mod tests { fn test_i8_to_group() { check_cast_lossy::, console_root::types::Group>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Group>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Group>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -306,15 +306,15 @@ mod tests { fn test_i16_to_address() { check_cast_lossy::, console_root::types::Address>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Address>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Address>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -354,15 +354,15 @@ mod tests { fn test_i16_to_group() { check_cast_lossy::, console_root::types::Group>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Group>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Group>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -482,15 +482,15 @@ mod tests { fn test_i32_to_address() { check_cast_lossy::, console_root::types::Address>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Address>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Address>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -530,15 +530,15 @@ mod tests { fn test_i32_to_group() { check_cast_lossy::, console_root::types::Group>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Group>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Group>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -658,15 +658,15 @@ mod tests { fn test_i64_to_address() { check_cast_lossy::, console_root::types::Address>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Address>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Address>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -706,15 +706,15 @@ mod tests { fn test_i64_to_group() { check_cast_lossy::, console_root::types::Group>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Group>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Group>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -834,15 +834,15 @@ mod tests { fn test_i128_to_address() { check_cast_lossy::, console_root::types::Address>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Address>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Address>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -882,15 +882,15 @@ mod tests { fn test_i128_to_group() { check_cast_lossy::, console_root::types::Group>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Group>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Group>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -1006,15 +1006,15 @@ mod tests { fn test_u8_to_address() { check_cast_lossy::, console_root::types::Address>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Address>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Address>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -1054,15 +1054,15 @@ mod tests { fn test_u8_to_group() { check_cast_lossy::, console_root::types::Group>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Group>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Group>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -1182,15 +1182,15 @@ mod tests { fn test_u16_to_address() { check_cast_lossy::, console_root::types::Address>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Address>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Address>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -1230,15 +1230,15 @@ mod tests { fn test_u16_to_group() { check_cast_lossy::, console_root::types::Group>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Group>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Group>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -1358,15 +1358,15 @@ mod tests { fn test_u32_to_address() { check_cast_lossy::, console_root::types::Address>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Address>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Address>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -1406,15 +1406,15 @@ mod tests { fn test_u32_to_group() { check_cast_lossy::, console_root::types::Group>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Group>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Group>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -1534,15 +1534,15 @@ mod tests { fn test_u64_to_address() { check_cast_lossy::, console_root::types::Address>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Address>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Address>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -1582,15 +1582,15 @@ mod tests { fn test_u64_to_group() { check_cast_lossy::, console_root::types::Group>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Group>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Group>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -1710,15 +1710,15 @@ mod tests { fn test_u128_to_address() { check_cast_lossy::, console_root::types::Address>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Address>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Address>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -1758,15 +1758,15 @@ mod tests { fn test_u128_to_group() { check_cast_lossy::, console_root::types::Group>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Group>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Group>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } diff --git a/circuit/program/src/data/literal/cast_lossy/scalar.rs b/circuit/program/src/data/literal/cast_lossy/scalar.rs index 95fddba50b..1b3d77475c 100644 --- a/circuit/program/src/data/literal/cast_lossy/scalar.rs +++ b/circuit/program/src/data/literal/cast_lossy/scalar.rs @@ -118,15 +118,15 @@ mod tests { fn test_scalar_to_address() { check_cast_lossy::, console_root::types::Address>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Address>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Address>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); } @@ -157,15 +157,15 @@ mod tests { fn test_scalar_to_group() { check_cast_lossy::, console_root::types::Group>( Mode::Constant, - count_less_than!(551, 0, 0, 0), + count_less_than!(4303, 0, 0, 0), ); check_cast_lossy::, console_root::types::Group>( Mode::Public, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); check_cast_lossy::, console_root::types::Group>( Mode::Private, - count_is!(277, 0, 899, 904), + count_is!(2029, 0, 6745, 6750), ); }