fix: Cleanup gen_inner_proof_files.sh script.

barretenberg/acir_tests/clone_test_vectors.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -eu
+
+# Pull down the test vectors from the noir repo, if we don't have the folder already.
+if [ ! -d acir_tests ]; then
+  if [ -n "${TEST_SRC:-}" ]; then
+    cp -R $TEST_SRC acir_tests
+  else
+    rm -rf noir
+    git clone -b $BRANCH --filter=blob:none --no-checkout https://github.com/noir-lang/noir.git
+    cd noir
+    git sparse-checkout init --cone
+    git sparse-checkout set tooling/nargo_cli/tests/acir_artifacts
+    git checkout
+    cd ..
+    mv noir/tooling/nargo_cli/tests/acir_artifacts acir_tests
+    rm -rf noir
+  fi
+fi

barretenberg/acir_tests/gen_inner_proof_inputs.sh

@@ -4,75 +4,42 @@
 set -eu
 
 BIN=${BIN:-../cpp/build/bin/bb}
-WRITE_VK_FLOW=${FLOW:-write_vk}
-VK_FIELDS_FLOW=${FLOW:-vk_as_fields}
-PROVE_FLOW=${FLOW:-prove}
-PROOF_FIELDS_FLOW=${FLOW:-proof_as_fields}
 CRS_PATH=~/.bb-crs
 BRANCH=master
 VERBOSE=${VERBOSE:-}
 RECURSIVE=true
 PROOF_NAME="proof_a"
 
-WRITE_VK_FLOW_SCRIPT=$(realpath ./flows/${WRITE_VK_FLOW}.sh)
-VK_FIELDS_FLOW_SCRIPT=$(realpath ./flows/${VK_FIELDS_FLOW}.sh)
-PROVE_FLOW_SCRIPT=$(realpath ./flows/${PROVE_FLOW}.sh)
-PROOF_FIELDS_FLOW_SCRIPT=$(realpath ./flows/${PROOF_FIELDS_FLOW}.sh)
-
 if [ -f $BIN ]; then
     BIN=$(realpath $BIN)
 else
     BIN=$(realpath $(which $BIN))
 fi
 
-export BIN CRS_PATH VERBOSE RECURSIVE PROOF_NAME
-
-# Pull down the test vectors from the noir repo, if we don't have the folder already.
-if [ ! -d acir_tests ]; then
-  if [ -n "${TEST_SRC:-}" ]; then
-    cp -R $TEST_SRC acir_tests
-  else
-    rm -rf noir
-    git clone -b $BRANCH --filter=blob:none --no-checkout https://github.com/noir-lang/noir.git
-    cd noir
-    git sparse-checkout init --cone
-    git sparse-checkout set tooling/nargo_cli/tests/acir_artifacts
-    git checkout
-    cd ..
-    mv noir/tooling/nargo_cli/tests/acir_artifacts acir_tests
-    rm -rf noir
-  fi
-fi
+export BRANCH
 
-cd acir_tests
+./clone_test_vectors.sh
 
-cd assert_statement
+cd acir_tests/assert_statement
 
 PROOF_DIR=$PWD/proofs
 PROOF_PATH=$PROOF_DIR/$PROOF_NAME
+VFLAG=${VERBOSE:+-v}
+RFLAG=${RECURSIVE:+-r}
 
-echo -e "Write VK to file for assert_statement..\n"
-set +e
-$WRITE_VK_FLOW_SCRIPT
-set -eu
+echo "Write VK to file for assert_statement..."
+$BIN write_vk $VFLAG -c $CRS_PATH -o
 
-echo -e "Write VK as fields for recursion...\n"
-set +e
-$VK_FIELDS_FLOW_SCRIPT
-set -eu
+echo "Write VK as fields for recursion..."
+$BIN vk_as_fields $VFLAG -c $CRS_PATH
 
-echo -e "Generate proof to file...\n"
-set +e
-if [ ! -d "$PROOF_DIR" ]; then
-  mkdir $PWD/proofs
-fi
-if [ ! -e "$PROOF_PATH" ]; then
-  touch $PROOF_PATH
-fi
-$PROVE_FLOW_SCRIPT
-set -eu
+echo "Generate proof to file..."
+[ -d "$PROOF_DIR" ] || mkdir $PWD/proofs
+[ -e "$PROOF_PATH" ] || touch $PROOF_PATH
+$BIN prove $VFLAG -c $CRS_PATH -b ./target/acir.gz -o "./proofs/$PROOF_NAME" $RFLAG
 
-echo -e "Write proof as fields for recursion...\n"
-set +e
-$PROOF_FIELDS_FLOW_SCRIPT
-set -eu
+echo "Write proof as fields for recursion..."
+$BIN proof_as_fields $VFLAG -c $CRS_PATH -p "./proofs/$PROOF_NAME"
+
+cat ./proofs/${PROOF_NAME}_fields.json
+echo

barretenberg/acir_tests/run_acir_tests.sh

@@ -19,24 +19,9 @@ else
     BIN=$(realpath $(which $BIN))
 fi
 
-export BIN CRS_PATH VERBOSE
+export BIN CRS_PATH VERBOSE BRANCH
 
-# Pull down the test vectors from the noir repo, if we don't have the folder already.
-if [ ! -d acir_tests ]; then
-  if [ -n "${TEST_SRC:-}" ]; then
-    cp -R $TEST_SRC acir_tests
-  else
-    rm -rf noir
-    git clone -b $BRANCH --filter=blob:none --no-checkout https://github.com/noir-lang/noir.git
-    cd noir
-    git sparse-checkout init --cone
-    git sparse-checkout set tooling/nargo_cli/tests/acir_artifacts
-    git checkout
-    cd ..
-    mv noir/tooling/nargo_cli/tests/acir_artifacts acir_tests
-    rm -rf noir
-  fi
-fi
+./clone_test_vectors.sh
 
 cd acir_tests