fixing rebase problems

noir-lang · May 5, 2023 · 014e598 · 014e598
1 parent 230c5be
commit 014e598
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 29 deletions.
diff --git a/src/composer.rs b/src/composer.rs
@@ -280,7 +280,7 @@ impl Composer for Barretenberg {
         let vk_size = self
             .call_multiple(
                 "acir_proofs_init_verification_key",
-                vec![&pippenger_ptr.into(), &g2_ptr, &pk_ptr, &vk_ptr_ptr.into()],
+                vec![&pippenger_ptr, &g2_ptr, &pk_ptr, &vk_ptr_ptr.into()],
             )?
             .i32()?;
 
@@ -318,7 +318,7 @@ impl Composer for Barretenberg {
             .call_multiple(
                 "acir_proofs_new_proof",
                 vec![
-                    &pippenger_ptr.into(),
+                    &pippenger_ptr,
                     &g2_ptr,
                     &pk_ptr,
                     &cs_ptr,

diff --git a/src/lib.rs b/src/lib.rs
@@ -229,32 +229,6 @@ mod wasm {
         fn try_from(x: WASMValue) -> Result<Self, Self::Error> {
             x.value()
         }
-
-        pub(super) fn bool(self) -> bool {
-            match self.i32() {
-                0 => false,
-                1 => true,
-                _ => panic!("expected a boolean value"),
-            }
-        }
-    }
-
-    impl From<usize> for WASMValue {
-        fn from(value: usize) -> Self {
-            WASMValue(Some(Value::I32(value as i32)))
-        }
-    }
-
-    impl From<i32> for WASMValue {
-        fn from(value: i32) -> Self {
-            WASMValue(Some(Value::I32(value)))
-        }
-    }
-
-    impl From<Value> for WASMValue {
-        fn from(value: Value) -> Self {
-            WASMValue(Some(value))
-        }
     }
 
     impl Barretenberg {

diff --git a/src/pippenger.rs b/src/pippenger.rs
@@ -45,7 +45,7 @@ impl Barretenberg {
         self.free(crs_ptr)?;
 
         Ok(Pippenger {
-            pippenger_ptr: pippenger_ptr?.value()?,
+            pippenger_ptr: pippenger_ptr?,
         })
     }
 }