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

chore: nargo fmt #3612

Merged
merged 1 commit into from Nov 28, 2023
Merged

chore: nargo fmt #3612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
88 changes: 54 additions & 34 deletions test_programs/compile_success_empty/ec_baby_jubjub/src/main.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,37 @@ fn main() {
);

let p3_affine = bjj_affine.add(p1_affine, p2_affine);
assert(p3_affine.eq(
Gaffine::new(
7916061937171219682591368294088513039687205273691143098332585753343424131937,
14035240266687799601661095864649209771790948434046947201833777492504781204499
assert(
p3_affine.eq(
Gaffine::new(
7916061937171219682591368294088513039687205273691143098332585753343424131937,
14035240266687799601661095864649209771790948434046947201833777492504781204499
)
)
));
);
// Test scalar multiplication
let p4_affine = bjj_affine.mul(2, p1_affine);
assert(p4_affine.eq(
Gaffine::new(
6890855772600357754907169075114257697580319025794532037257385534741338397365,
4338620300185947561074059802482547481416142213883829469920100239455078257889
assert(
p4_affine.eq(
Gaffine::new(
6890855772600357754907169075114257697580319025794532037257385534741338397365,
4338620300185947561074059802482547481416142213883829469920100239455078257889
)
)
));
);
assert(p4_affine.eq(bjj_affine.bit_mul([0, 1], p1_affine)));
// Test subtraction
let p5_affine = bjj_affine.subtract(p3_affine, p3_affine);
assert(p5_affine.eq(Gaffine::zero()));
// Check that these points are on the curve
assert(bjj_affine.contains(bjj_affine.gen)
assert(
bjj_affine.contains(bjj_affine.gen)
& bjj_affine.contains(p1_affine)
& bjj_affine.contains(p2_affine)
& bjj_affine.contains(p3_affine)
& bjj_affine.contains(p4_affine)
& bjj_affine.contains(p5_affine));
& bjj_affine.contains(p5_affine)
);
// Test CurveGroup equivalents
let bjj = bjj_affine.into_group(); // Baby Jubjub
let p1 = p1_affine.into_group();
Expand All @@ -74,12 +80,14 @@ fn main() {
assert(G::zero().eq(bjj.subtract(p3, p3)));
assert(p5.eq(G::zero()));
// Check that these points are on the curve
assert(bjj.contains(bjj.gen)
assert(
bjj.contains(bjj.gen)
& bjj.contains(p1)
& bjj.contains(p2)
& bjj.contains(p3)
& bjj.contains(p4)
& bjj.contains(p5));
& bjj.contains(p5)
);
// Test SWCurve equivalents of the above
// First the affine representation
let bjj_swcurve_affine = bjj_affine.into_swcurve();
Expand All @@ -98,12 +106,14 @@ fn main() {
assert(SWGaffine::zero().eq(bjj_swcurve_affine.subtract(p3_swcurve_affine, p3_swcurve_affine)));
assert(p5_swcurve_affine.eq(SWGaffine::zero()));
// Check that these points are on the curve
assert(bjj_swcurve_affine.contains(bjj_swcurve_affine.gen)
assert(
bjj_swcurve_affine.contains(bjj_swcurve_affine.gen)
& bjj_swcurve_affine.contains(p1_swcurve_affine)
& bjj_swcurve_affine.contains(p2_swcurve_affine)
& bjj_swcurve_affine.contains(p3_swcurve_affine)
& bjj_swcurve_affine.contains(p4_swcurve_affine)
& bjj_swcurve_affine.contains(p5_swcurve_affine));
& bjj_swcurve_affine.contains(p5_swcurve_affine)
);
// Then the CurveGroup representation
let bjj_swcurve = bjj.into_swcurve();

Expand All @@ -121,12 +131,14 @@ fn main() {
assert(SWG::zero().eq(bjj_swcurve.subtract(p3_swcurve, p3_swcurve)));
assert(p5_swcurve.eq(SWG::zero()));
// Check that these points are on the curve
assert(bjj_swcurve.contains(bjj_swcurve.gen)
assert(
bjj_swcurve.contains(bjj_swcurve.gen)
& bjj_swcurve.contains(p1_swcurve)
& bjj_swcurve.contains(p2_swcurve)
& bjj_swcurve.contains(p3_swcurve)
& bjj_swcurve.contains(p4_swcurve)
& bjj_swcurve.contains(p5_swcurve));
& bjj_swcurve.contains(p5_swcurve)
);
// Test MontCurve conversions
// First the affine representation
let bjj_montcurve_affine = bjj_affine.into_montcurve();
Expand All @@ -145,12 +157,14 @@ fn main() {
assert(MGaffine::zero().eq(bjj_montcurve_affine.subtract(p3_montcurve_affine, p3_montcurve_affine)));
assert(p5_montcurve_affine.eq(MGaffine::zero()));
// Check that these points are on the curve
assert(bjj_montcurve_affine.contains(bjj_montcurve_affine.gen)
assert(
bjj_montcurve_affine.contains(bjj_montcurve_affine.gen)
& bjj_montcurve_affine.contains(p1_montcurve_affine)
& bjj_montcurve_affine.contains(p2_montcurve_affine)
& bjj_montcurve_affine.contains(p3_montcurve_affine)
& bjj_montcurve_affine.contains(p4_montcurve_affine)
& bjj_montcurve_affine.contains(p5_montcurve_affine));
& bjj_montcurve_affine.contains(p5_montcurve_affine)
);
// Then the CurveGroup representation
let bjj_montcurve = bjj.into_montcurve();

Expand All @@ -168,31 +182,37 @@ fn main() {
assert(MG::zero().eq(bjj_montcurve.subtract(p3_montcurve, p3_montcurve)));
assert(p5_montcurve.eq(MG::zero()));
// Check that these points are on the curve
assert(bjj_montcurve.contains(bjj_montcurve.gen)
assert(
bjj_montcurve.contains(bjj_montcurve.gen)
& bjj_montcurve.contains(p1_montcurve)
& bjj_montcurve.contains(p2_montcurve)
& bjj_montcurve.contains(p3_montcurve)
& bjj_montcurve.contains(p4_montcurve)
& bjj_montcurve.contains(p5_montcurve));
& bjj_montcurve.contains(p5_montcurve)
);
// Elligator 2 map-to-curve
let ell2_pt_map = bjj_affine.elligator2_map(27);

assert(ell2_pt_map.eq(
MGaffine::new(
7972459279704486422145701269802978968072470631857513331988813812334797879121,
8142420778878030219043334189293412482212146646099536952861607542822144507872
).into_tecurve()
));
assert(
ell2_pt_map.eq(
MGaffine::new(
7972459279704486422145701269802978968072470631857513331988813812334797879121,
8142420778878030219043334189293412482212146646099536952861607542822144507872
).into_tecurve()
)
);
// SWU map-to-curve
let swu_pt_map = bjj_affine.swu_map(5, 27);

assert(swu_pt_map.eq(
bjj_affine.map_from_swcurve(
SWGaffine::new(
2162719247815120009132293839392097468339661471129795280520343931405114293888,
5341392251743377373758788728206293080122949448990104760111875914082289313973
assert(
swu_pt_map.eq(
bjj_affine.map_from_swcurve(
SWGaffine::new(
2162719247815120009132293839392097468339661471129795280520343931405114293888,
5341392251743377373758788728206293080122949448990104760111875914082289313973
)
)
)
));
);
}
}
6 changes: 4 additions & 2 deletions test_programs/execution_success/higher_order_functions/src/main.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ fn main(w: Field) -> pub Field {
assert(twice(|x| x * 2, 5) == 20);
assert((|x, y| x + y + 1)(2, 3) == 6);
// nested lambdas
assert((|a, b| {
assert(
(|a, b| {
a + (|c| c + 2)(b)
})(0, 1)
== 3);
== 3
);
// Closures:
let a = 42;
let g = || a;
Expand Down
6 changes: 4 additions & 2 deletions test_programs/execution_success/regression/src/main.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,13 @@ fn main(x: [u8; 5], z: Field) {

let enc_val1 = enc(val1, val1_length);

assert(enc_val1.0 == [
assert(
enc_val1.0 == [
0x94, 0xb8, 0x8f, 0x61, 0xe6, 0xfb, 0xda, 0x83, 0xfb, 0xff, 0xfa, 0xbe, 0x36, 0x41,
0x12, 0x13, 0x74, 0x80, 0x39, 0x80, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00
]);
]
);
assert(enc_val1.1 == 21);
// Issue 2399
let result_0 = bitshift_literal_0();
Expand Down
2 changes: 1 addition & 1 deletion test_programs/execution_success/workspace/crates/b/src/main.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
fn main(x : Field, y : pub Field) {
fn main(x: Field, y: pub Field) {
assert(x != y);
}
2 changes: 1 addition & 1 deletion test_programs/execution_success/workspace_default_member/a/src/main.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
fn main(x : Field, y : pub Field) {
fn main(x: Field, y: pub Field) {
assert(x == y);
}
Loading