M Cargo.toml → Cargo.toml

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

M src/bellperson/shape_cs.rs → src/bellperson/shape_cs.rs

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