Skip to content
This repository has been archived by the owner on Apr 9, 2024. It is now read-only.

Commit

Permalink
fix: prevent bn254 feature flag always being enabled (#225)
Browse files Browse the repository at this point in the history
* fix: prevent bn254 feature flag always being enabled

* chore: misc `Cargo.toml` cleanup
  • Loading branch information
TomAFrench authored Apr 26, 2023
1 parent 198fb69 commit 82eee6a
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 11 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
members = ["acir_field", "acir", "acvm", "stdlib"]

[workspace.package]
authors = ["The Noir Team <[email protected]>"]
authors = ["The Noir Team <[email protected]>"]
edition = "2021"
license = "MIT"
rust-version = "1.66"

[workspace.dependencies]
acir = { version = "0.9.0", path = "acir" }
acir_field = { version = "0.9.0", path = "acir_field" }
acir_field = { version = "0.9.0", path = "acir_field", default-features = false }
stdlib = { package = "acvm_stdlib", version = "0.9.0", path = "stdlib" }

hex = "0.4.2"
Expand All @@ -19,4 +19,4 @@ num-traits = "0.2"

blake2 = "0.9.1"

serde = { version = "1.0.136", features = ["derive"] }
serde = { version = "1.0.136", features = ["derive"] }
4 changes: 2 additions & 2 deletions acir_field/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ cfg-if = "1.0.0"

[features]
default = ["bn254"]
bn254 = ["ark-bn254", "ark-ff"]
bls12_381 = ["ark-bls12-381", "ark-ff"]
bn254 = ["dep:ark-bn254", "dep:ark-ff"]
bls12_381 = ["dep:ark-bls12-381", "dep:ark-ff"]
4 changes: 2 additions & 2 deletions acvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ indexmap = "1.7.0"
thiserror = "1.0.21"

[features]
bn254 = ["acir/bn254"]
bls12_381 = ["acir/bls12_381"]
bn254 = ["acir/bn254", "stdlib/bn254"]
bls12_381 = ["acir/bls12_381", "stdlib/bls12_381"]

[dev-dependencies]
rand = "0.8.5"
15 changes: 11 additions & 4 deletions stdlib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
[package]
name = "acvm_stdlib"
version = "0.9.0"
edition = "2021"
license = "MIT"
description = "The ACVM standard library."
version = "0.9.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
rust-version.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
acir = { version = "0.9.0", path = "../acir", features = ["bn254"] }
acir.workspace = true

[features]
bn254 = ["acir/bn254"]
bls12_381 = ["acir/bls12_381"]

0 comments on commit 82eee6a

Please sign in to comment.