From a0e3c84cf5da795897d0e14ef9db9873f8a76d6b Mon Sep 17 00:00:00 2001
From: TomAFrench <tom@tomfren.ch>
Date: Mon, 13 May 2024 13:54:58 +0000
Subject: [PATCH] chore: update integration tests to call `bb` directly

---
 .../scripts/codegen-verifiers.sh              | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/noir/noir-repo/compiler/integration-tests/scripts/codegen-verifiers.sh b/noir/noir-repo/compiler/integration-tests/scripts/codegen-verifiers.sh
index e377a3ee3f8..7edd723f967 100644
--- a/noir/noir-repo/compiler/integration-tests/scripts/codegen-verifiers.sh
+++ b/noir/noir-repo/compiler/integration-tests/scripts/codegen-verifiers.sh
@@ -1,26 +1,27 @@
 #!/usr/bin/env bash
 
+NARGO_BACKEND_PATH=${NARGO_BACKEND_PATH:-bb}
+
 self_path=$(dirname "$(readlink -f "$0")")
 
 repo_root=$self_path/../../..
 
-# Run codegen-verifier for 1_mul
+# We want to move all the contracts to the root of compiler/integration-tests
+contracts_dir=$self_path/../contracts
+rm -rf $contracts_dir
+mkdir $contracts_dir
+
+# Codegen verifier contract for 1_mul
 mul_dir=$repo_root/test_programs/execution_success/1_mul
-nargo --program-dir $mul_dir codegen-verifier
+nargo --program-dir $mul_dir compile
+$NARGO_BACKEND_PATH write_vk -b $mul_dir/target/1_mul.json -o $contracts_dir/1_mul.sol 
 
-# Run codegen-verifier for assert_statement
+# Codegen verifier contract for assert_statement
 assert_statement_dir=$repo_root/test_programs/execution_success/assert_statement
-nargo --program-dir $assert_statement_dir codegen-verifier
+nargo --program-dir $assert_statement_dir compile
+$NARGO_BACKEND_PATH write_vk -b $assert_statement_dir/target/assert_statement.json -o $contracts_dir/assert_statement.sol 
 
-# Run codegen-verifier for recursion
+# Codegen verifier contract for recursion
 recursion_dir=$repo_root/compiler/integration-tests/circuits/recursion
-nargo --program-dir $recursion_dir codegen-verifier
-
-# Copy compiled contracts from the root of compiler/integration-tests
-contracts_dir=$self_path/../contracts
-rm -rf $contracts_dir
-mkdir $contracts_dir
-
-cp $mul_dir/contract/1_mul/plonk_vk.sol $contracts_dir/1_mul.sol
-cp $assert_statement_dir/contract/assert_statement/plonk_vk.sol $contracts_dir/assert_statement.sol
-cp $recursion_dir/contract/recursion/plonk_vk.sol $contracts_dir/recursion.sol
+nargo --program-dir $recursion_dir compile
+$NARGO_BACKEND_PATH write_vk -b $recursion_dir/target/recursion.json -o $contracts_dir/recursion.sol 
\ No newline at end of file