Merge branch 'master' into arv/runtime_separation

noir-lang · May 29, 2024 · d28c834 · d28c834
2 parents 304be4f + b545744
commit d28c834
Show file tree

Hide file tree

Showing 39 changed files with 43 additions and 268 deletions.
diff --git a/test_programs/execution_success/brillig_array_eq/Prover.toml b/test_programs/execution_success/brillig_array_eq/Prover.toml
diff --git a/test_programs/execution_success/brillig_array_eq/src/main.nr b/test_programs/execution_success/brillig_array_eq/src/main.nr
diff --git a/test_programs/execution_success/brillig_bit_shifts_runtime/Nargo.toml b/test_programs/execution_success/brillig_bit_shifts_runtime/Nargo.toml
diff --git a/test_programs/execution_success/brillig_bit_shifts_runtime/Prover.toml b/test_programs/execution_success/brillig_bit_shifts_runtime/Prover.toml
diff --git a/test_programs/execution_success/brillig_bit_shifts_runtime/src/main.nr b/test_programs/execution_success/brillig_bit_shifts_runtime/src/main.nr
diff --git a/test_programs/execution_success/brillig_embedded_curve/Nargo.toml b/test_programs/execution_success/brillig_embedded_curve/Nargo.toml
diff --git a/test_programs/execution_success/brillig_embedded_curve/Prover.toml b/test_programs/execution_success/brillig_embedded_curve/Prover.toml
diff --git a/test_programs/execution_success/brillig_embedded_curve/src/main.nr b/test_programs/execution_success/brillig_embedded_curve/src/main.nr
diff --git a/test_programs/execution_success/brillig_schnorr/Prover.toml b/test_programs/execution_success/brillig_schnorr/Prover.toml
diff --git a/test_programs/execution_success/brillig_schnorr/src/main.nr b/test_programs/execution_success/brillig_schnorr/src/main.nr
diff --git a/test_programs/execution_success/brillig_signed_cmp/Nargo.toml b/test_programs/execution_success/brillig_signed_cmp/Nargo.toml
diff --git a/test_programs/execution_success/brillig_to_be_bytes/Nargo.toml b/test_programs/execution_success/brillig_to_be_bytes/Nargo.toml
diff --git a/test_programs/execution_success/brillig_to_be_bytes/Prover.toml b/test_programs/execution_success/brillig_to_be_bytes/Prover.toml
diff --git a/test_programs/execution_success/brillig_to_be_bytes/src/main.nr b/test_programs/execution_success/brillig_to_be_bytes/src/main.nr
diff --git a/test_programs/execution_success/brillig_to_bytes_integration/Nargo.toml b/test_programs/execution_success/brillig_to_bytes_integration/Nargo.toml
diff --git a/test_programs/execution_success/brillig_to_bytes_integration/Prover.toml b/test_programs/execution_success/brillig_to_bytes_integration/Prover.toml
diff --git a/test_programs/execution_success/brillig_to_bytes_integration/src/main.nr b/test_programs/execution_success/brillig_to_bytes_integration/src/main.nr
diff --git a/test_programs/execution_success/brillig_to_le_bytes/Nargo.toml b/test_programs/execution_success/brillig_to_le_bytes/Nargo.toml
diff --git a/test_programs/execution_success/brillig_to_le_bytes/Prover.toml b/test_programs/execution_success/brillig_to_le_bytes/Prover.toml
diff --git a/test_programs/execution_success/brillig_to_le_bytes/src/main.nr b/test_programs/execution_success/brillig_to_le_bytes/src/main.nr
diff --git a/test_programs/execution_success/brillig_top_level/Nargo.toml b/test_programs/execution_success/brillig_top_level/Nargo.toml
diff --git a/test_programs/execution_success/brillig_top_level/Prover.toml b/test_programs/execution_success/brillig_top_level/Prover.toml
diff --git a/test_programs/execution_success/brillig_top_level/src/main.nr b/test_programs/execution_success/brillig_top_level/src/main.nr
diff --git a/...cution_success/brillig_to_bits/Nargo.toml → ...ograms/execution_success/empty/Nargo.toml b/...cution_success/brillig_to_bits/Nargo.toml → ...ograms/execution_success/empty/Nargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "brillig_to_bits"
+name = "empty"
 type = "bin"
 authors = [""]
 [dependencies]
diff --git a/test_programs/execution_success/empty/src/main.nr b/test_programs/execution_success/empty/src/main.nr
@@ -0,0 +1 @@
+fn main() {}
diff --git a/...cution_success/brillig_schnorr/Nargo.toml → ...s/execution_success/signed_cmp/Nargo.toml b/...cution_success/brillig_schnorr/Nargo.toml → ...s/execution_success/signed_cmp/Nargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "brillig_schnorr"
+name = "signed_cmp"
 type = "bin"
 authors = [""]
 

diff --git a/...on_success/brillig_signed_cmp/Prover.toml → .../execution_success/signed_cmp/Prover.toml b/...on_success/brillig_signed_cmp/Prover.toml → .../execution_success/signed_cmp/Prover.toml
diff --git a/...on_success/brillig_signed_cmp/src/main.nr → .../execution_success/signed_cmp/src/main.nr b/...on_success/brillig_signed_cmp/src/main.nr → .../execution_success/signed_cmp/src/main.nr
@@ -1,4 +1,4 @@
-unconstrained fn main(minus_one: i8) {
+fn main(minus_one: i8) {
     assert(minus_one < 0);
     assert(0 < minus_one as u8);
     assert(0 > minus_one);

diff --git a/...ution_success/brillig_array_eq/Nargo.toml → ...s/execution_success/signed_div/Nargo.toml b/...ution_success/brillig_array_eq/Nargo.toml → ...s/execution_success/signed_div/Nargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "brillig_array_eq"
+name = "signed_div"
 type = "bin"
 authors = [""]
 

diff --git a/...on_success/brillig_signed_div/Prover.toml → .../execution_success/signed_div/Prover.toml b/...on_success/brillig_signed_div/Prover.toml → .../execution_success/signed_div/Prover.toml
diff --git a/...on_success/brillig_signed_div/src/main.nr → .../execution_success/signed_div/src/main.nr b/...on_success/brillig_signed_div/src/main.nr → .../execution_success/signed_div/src/main.nr
diff --git a/...ution_success/brillig_wrapping/Nargo.toml → ...rams/execution_success/to_bits/Nargo.toml b/...ution_success/brillig_wrapping/Nargo.toml → ...rams/execution_success/to_bits/Nargo.toml
@@ -1,6 +1,5 @@
 [package]
-name = "brillig_wrapping"
+name = "to_bits"
 type = "bin"
 authors = [""]
-
 [dependencies]
diff --git a/...ution_success/brillig_to_bits/src/main.nr → ...ams/execution_success/to_bits/src/main.nr b/...ution_success/brillig_to_bits/src/main.nr → ...ams/execution_success/to_bits/src/main.nr
@@ -1,6 +1,6 @@
 use dep::std;
 
-unconstrained fn main() {
+fn main() {
     let field = 1000;
     let be_bits = field.to_be_bits(16);
     let le_bits = field.to_le_bits(16);

diff --git a/test_programs/execution_success/unconstrained_empty/Nargo.toml b/test_programs/execution_success/unconstrained_empty/Nargo.toml
diff --git a/test_programs/execution_success/unconstrained_empty/src/main.nr b/test_programs/execution_success/unconstrained_empty/src/main.nr
diff --git a/...ion_success/brillig_signed_div/Nargo.toml → ...on_success/wrapping_operations/Nargo.toml b/...ion_success/brillig_signed_div/Nargo.toml → ...on_success/wrapping_operations/Nargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "brillig_signed_div"
+name = "wrapping_operations"
 type = "bin"
 authors = [""]
 

diff --git a/...tion_success/brillig_wrapping/Prover.toml → ...n_success/wrapping_operations/Prover.toml b/...tion_success/brillig_wrapping/Prover.toml → ...n_success/wrapping_operations/Prover.toml
diff --git a/...tion_success/brillig_wrapping/src/main.nr → ...n_success/wrapping_operations/src/main.nr b/...tion_success/brillig_wrapping/src/main.nr → ...n_success/wrapping_operations/src/main.nr
@@ -1,6 +1,6 @@
 use dep::std;
 
-unconstrained fn main(x: u8, y: u8) {
+fn main(x: u8, y: u8) {
     assert(std::wrapping_sub(x, 1) == y);
     assert(std::wrapping_add(y, 1) == x);
     assert(std::wrapping_mul(y, y) == 1);