Skip to content

Commit

Permalink
fix: 9_conditional end to end test (#1951)
Browse files Browse the repository at this point in the history
* update to acvm 0.19.1

* add 9_conditional

* use a smaller circuit

* add predicate for division

* reduce lhs and rhs constraints

* pass predicate to inv_var

* [DO NOT MERGE] Test removing unconditional assert

* fix clippy

* remove Option<Expression>

* add `assert_eq` and `maybe_eq_predicate`

* sort now takes a predicate

* add back full 9_conditional

* change unwrap to expect
  • Loading branch information
kevaundray authored Jul 19, 2023
1 parent f99f4bf commit 2f6741f
Show file tree
Hide file tree
Showing 8 changed files with 418 additions and 49 deletions.
28 changes: 14 additions & 14 deletions Cargo.lock

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
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[package]
authors = [""]
compiler_version = "0.1"

[dependencies]
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

0 comments on commit 2f6741f

Please sign in to comment.