arnaucube/Nova
1
0
Fork 0
mirror of https://github.com/arnaucube/Nova.git synced 2026-01-11 08:31:29 +01:00
Code Issues Projects Releases Wiki Activity

fix bellperson path; address minor clippy-suggested edit

Browse Source
This commit is contained in:
Srinath Setty
2021-10-14 16:52:13 -07:00
parent efb73ef325
commit ff885c4d5d
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -11,7 +11,7 @@ license-file = "LICENSE"
keywords = ["zkSNARKs", "cryptography", "proofs"] keywords = ["zkSNARKs", "cryptography", "proofs"]
[dependencies] [dependencies]
bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "nova-minimal" } bellperson = { git = "https://github.com/filecoin-project/bellperson" }
ff = "0.11.0" ff = "0.11.0"
merlin = "2.0.0" merlin = "2.0.0"
rand = "0.8.4" rand = "0.8.4"

10
src/bellperson/shape_cs.rs
View File

@@ -160,7 +160,7 @@ where
let pp = |s: &mut String, lc: &LinearCombination<G::Scalar>| { let pp = |s: &mut String, lc: &LinearCombination<G::Scalar>| {
s.push('('); s.push('(');
let mut is_first = true; let mut is_first = true;
for (var, coeff) in proc_lc::<G::Scalar>(&lc) { for (var, coeff) in proc_lc::<G::Scalar>(lc) {
if coeff == negone { if coeff == negone {
s.push_str(" - ") s.push_str(" - ")
} else if !is_first { } else if !is_first {
@@ -213,9 +213,7 @@ where
/// TODO: document /// TODO: document
fn set_named_obj(&mut self, path: String, to: NamedObject) { fn set_named_obj(&mut self, path: String, to: NamedObject) {
if self.named_objects.contains_key(&path) { assert!(!self.named_objects.contains_key(&path), "tried to create object at existing path: {}", path);
panic!("tried to create object at existing path: {}", path);
}
self.named_objects.insert(path, to); self.named_objects.insert(path, to);
} }
@@ -308,9 +306,7 @@ where
} }
fn compute_path(ns: &[String], this: &str) -> String { fn compute_path(ns: &[String], this: &str) -> String {
if this.chars().any(|a| a == '/') { assert!(!this.chars().any(|a| a == '/'), "'/' is not allowed in names");
panic!("'/' is not allowed in names");
}
let mut name = String::new(); let mut name = String::new();