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

fix: 9_conditional end to end test #1951

Merged
merged 13 commits into from
Jul 19, 2023
Merged

fix: 9_conditional end to end test #1951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
26fee5b
update to acvm 0.19.1
kevaundray Jul 17, 2023
9e1f3b3
add 9_conditional
kevaundray Jul 17, 2023
50cddc8
use a smaller circuit
kevaundray Jul 17, 2023
74393b2
add predicate for division
kevaundray Jul 18, 2023
4d82ddd
reduce lhs and rhs constraints
kevaundray Jul 18, 2023
56ab279
pass predicate to inv_var
kevaundray Jul 18, 2023
fa5f94f
[DO NOT MERGE] Test removing unconditional assert
kevaundray Jul 18, 2023
30437f4
fix clippy
kevaundray Jul 18, 2023
c3b6146
remove Option<Expression>
kevaundray Jul 18, 2023
d1fc87d
add `assert_eq` and `maybe_eq_predicate`
kevaundray Jul 18, 2023
7d455d6
sort now takes a predicate
kevaundray Jul 18, 2023
110b8c3
add back full 9_conditional
kevaundray Jul 18, 2023
abb7f1a
change unwrap to expect
kevaundray Jul 19, 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
28 changes: 14 additions & 14 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ edition = "2021"
rust-version = "1.66"

[workspace.dependencies]
acvm = "0.19.0"
acvm = "0.19.1"
arena = { path = "crates/arena" }
fm = { path = "crates/fm" }
iter-extended = { path = "crates/iter-extended" }
Expand All @@ -40,7 +40,7 @@ noir_wasm = { path = "crates/wasm" }

cfg-if = "1.0.0"
clap = { version = "4.1.4", features = ["derive"] }
codespan = {version = "0.11.1", features = ["serialization"]}
codespan = { version = "0.11.1", features = ["serialization"] }
codespan-lsp = "0.11.1"
codespan-reporting = "0.11.1"
chumsky = { git = "https://github.com/jfecher/chumsky", rev = "ad9d312" }
Expand Down
5 changes: 5 additions & 0 deletions crates/nargo_cli/tests/test_data_ssa_refactor/9_conditional/Nargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[package]
authors = [""]
compiler_version = "0.1"

[dependencies]
38 changes: 38 additions & 0 deletions crates/nargo_cli/tests/test_data_ssa_refactor/9_conditional/Prover.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
c=[2, 4, 3, 0, ]
a=0
x = [104, 101, 108, 108, 111]

result = [
0x2c,
0xf2,
0x4d,
0xba,
0x5f,
0xb0,
0xa3,
0x0e,
0x26,
0xe8,
0x3b,
0x2a,
0xc5,
0xb9,
0xe2,
0x9e,
0x1b,
0x16,
0x1e,
0x5c,
0x1f,
0xa7,
0x42,
0x5e,
0x73,
0x04,
0x33,
0x62,
0x93,
0x8b,
0x98,
0x24,
]
Loading