Merge pull request #815 from Zokrates/patch-libsnark-ci

Make sure libsnark is activated where applicable
Zokrates · Apr 13, 2021 · f38f837 · f38f837
2 parents 9a6956a + 07e27d0
commit f38f837
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 13 deletions.
diff --git a/build.sh b/build.sh
@@ -3,4 +3,8 @@
 # Exit if any subcommand fails
 set -e
 
-cargo build
+if [ -n "$WITH_LIBSNARK" ]; then
+	cargo -Z package-features build --package zokrates_cli --features="libsnark"
+else
+	cargo build
+fi
diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh
@@ -28,7 +28,14 @@ main() {
 
     test -f Cargo.lock || cargo generate-lockfile
 
-    cross build --bin zokrates --target $TARGET --release
+    case $TRAVIS_OS_NAME in
+        linux)
+            cross build --bin zokrates --package zokrates_cli --features="libsnark" --target $TARGET --release
+            ;;
+        *)
+            cross build --bin zokrates --package zokrates_cli --target $TARGET --release
+            ;;
+    esac
 
     # Package artifacts
     # Binary

diff --git a/full_test.sh b/full_test.sh
@@ -3,4 +3,8 @@
 # Exit if any subcommand fails
 set -e
 
-cargo test --release -- --ignored --test-threads=1
+if [ -n "$WITH_LIBSNARK" ]; then
+	cargo -Z package-features test --release --package zokrates_cli --features="libsnark" -- --ignored --test-threads=1
+else
+	cargo test --release -- --ignored --test-threads=1
+fi
diff --git a/test.sh b/test.sh
@@ -3,4 +3,8 @@
 # Exit if any subcommand fails
 set -e
 
-cargo test --release -- --test-threads=1
+if [ -n "$WITH_LIBSNARK" ]; then
+	cargo -Z package-features test --release --package zokrates_cli --features="libsnark" -- --test-threads=1
+else
+	cargo test --release -- --test-threads=1
+fi
diff --git a/zokrates_cli/tests/code/no_public.arguments.json b/zokrates_cli/tests/code/no_public.arguments.json
diff --git a/zokrates_cli/tests/code/no_public.expected.witness b/zokrates_cli/tests/code/no_public.expected.witness
diff --git a/zokrates_cli/tests/code/no_public.zok b/zokrates_cli/tests/code/no_public.zok
diff --git a/zokrates_core/src/proof_system/libsnark/mod.rs b/zokrates_core/src/proof_system/libsnark/mod.rs
@@ -25,7 +25,7 @@ pub fn prepare_public_inputs<T: Field>(public_inputs: Vec<T>) -> (Vec<[u8; 32]>,
     let mut public_inputs_arr: Vec<[u8; 32]> = vec![[0u8; 32]; public_inputs_length];
 
     for (index, value) in public_inputs.into_iter().enumerate() {
-        public_inputs_arr[index] = vec_as_u8_32_array(&value.into_byte_vector());
+        public_inputs_arr[index] = vec_as_u8_32_array(&value.to_byte_vector());
     }
 
     (public_inputs_arr, public_inputs_length)
@@ -62,21 +62,21 @@ pub fn prepare_setup<T: Field>(
             a_vec.push((
                 row as i32,
                 idx as i32,
-                vec_as_u8_32_array(&val.into_byte_vector()),
+                vec_as_u8_32_array(&val.to_byte_vector()),
             ));
         }
         for &(idx, ref val) in &b[row] {
             b_vec.push((
                 row as i32,
                 idx as i32,
-                vec_as_u8_32_array(&val.into_byte_vector()),
+                vec_as_u8_32_array(&val.to_byte_vector()),
             ));
         }
         for &(idx, ref val) in &c[row] {
             c_vec.push((
                 row as i32,
                 idx as i32,
-                vec_as_u8_32_array(&val.into_byte_vector()),
+                vec_as_u8_32_array(&val.to_byte_vector()),
             ));
         }
     }
@@ -177,10 +177,10 @@ pub fn prepare_generate_proof<T: Field>(
 
     //convert inputs
     for (index, value) in public_inputs.into_iter().enumerate() {
-        public_inputs_arr[index] = vec_as_u8_32_array(&value.into_byte_vector());
+        public_inputs_arr[index] = vec_as_u8_32_array(&value.to_byte_vector());
     }
     for (index, value) in private_inputs.into_iter().enumerate() {
-        private_inputs_arr[index] = vec_as_u8_32_array(&value.into_byte_vector());
+        private_inputs_arr[index] = vec_as_u8_32_array(&value.to_byte_vector());
     }
 
     (