From 0c75d161cb64e5e987deadf604527af446e71264 Mon Sep 17 00:00:00 2001 From: Tom French Date: Mon, 27 Nov 2023 12:39:38 +0000 Subject: [PATCH] chore: remove usage of `main` program in integration tests --- compiler/integration-tests/circuits/main/Nargo.toml | 5 ----- compiler/integration-tests/circuits/main/Prover.toml | 2 -- compiler/integration-tests/circuits/main/src/main.nr | 3 --- compiler/integration-tests/scripts/codegen-verifiers.sh | 8 ++++---- .../test/browser/compile_prove_verify.test.ts | 2 +- compiler/integration-tests/test/browser/recursion.test.ts | 2 +- .../test/node/smart_contract_verifier.test.ts | 4 ++-- 7 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 compiler/integration-tests/circuits/main/Nargo.toml delete mode 100644 compiler/integration-tests/circuits/main/Prover.toml delete mode 100644 compiler/integration-tests/circuits/main/src/main.nr diff --git a/compiler/integration-tests/circuits/main/Nargo.toml b/compiler/integration-tests/circuits/main/Nargo.toml deleted file mode 100644 index cc5a0a357fa..00000000000 --- a/compiler/integration-tests/circuits/main/Nargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[package] -name = "main" -type = "bin" -authors = [""] -[dependencies] diff --git a/compiler/integration-tests/circuits/main/Prover.toml b/compiler/integration-tests/circuits/main/Prover.toml deleted file mode 100644 index 2c1854573a4..00000000000 --- a/compiler/integration-tests/circuits/main/Prover.toml +++ /dev/null @@ -1,2 +0,0 @@ -x = 1 -y = 2 diff --git a/compiler/integration-tests/circuits/main/src/main.nr b/compiler/integration-tests/circuits/main/src/main.nr deleted file mode 100644 index 4e1fd3c9035..00000000000 --- a/compiler/integration-tests/circuits/main/src/main.nr +++ /dev/null @@ -1,3 +0,0 @@ -fn main(x: Field, y: pub Field) { - assert(x != y); -} diff --git a/compiler/integration-tests/scripts/codegen-verifiers.sh b/compiler/integration-tests/scripts/codegen-verifiers.sh index d0d52969acf..13667038728 100644 --- a/compiler/integration-tests/scripts/codegen-verifiers.sh +++ b/compiler/integration-tests/scripts/codegen-verifiers.sh @@ -8,13 +8,13 @@ repo_root=$self_path/../../.. mul_dir=$repo_root/test_programs/execution_success/1_mul nargo --program-dir $mul_dir codegen-verifier -# Run codegen-verifier for main -main_dir=$repo_root/compiler/integration-tests/circuits/main -nargo --program-dir $main_dir codegen-verifier +# Run codegen-verifier for assert_statement +assert_statement_dir=$repo_root/test_programs/execution_success/assert_statement +nargo --program-dir $assert_statement_dir codegen-verifier # Copy compiled contracts from the root of compiler/integration-tests contracts_dir=$self_path/../contracts mkdir $contracts_dir cp $mul_dir/contract/1_mul/plonk_vk.sol $contracts_dir/1_mul.sol -cp $main_dir/contract/main/plonk_vk.sol $contracts_dir/main.sol +cp $assert_statement_dir/contract/assert_statement/plonk_vk.sol $contracts_dir/assert_statement.sol diff --git a/compiler/integration-tests/test/browser/compile_prove_verify.test.ts b/compiler/integration-tests/test/browser/compile_prove_verify.test.ts index 7c3f284fa6f..2aef56c23f9 100644 --- a/compiler/integration-tests/test/browser/compile_prove_verify.test.ts +++ b/compiler/integration-tests/test/browser/compile_prove_verify.test.ts @@ -23,7 +23,7 @@ const test_cases = [ numPublicInputs: 0, }, { - case: 'compiler/integration-tests/circuits/main', + case: 'test_programs/execution_success/assert_statement', numPublicInputs: 1, }, ]; diff --git a/compiler/integration-tests/test/browser/recursion.test.ts b/compiler/integration-tests/test/browser/recursion.test.ts index dbf74882654..308be81417f 100644 --- a/compiler/integration-tests/test/browser/recursion.test.ts +++ b/compiler/integration-tests/test/browser/recursion.test.ts @@ -23,7 +23,7 @@ await initACVM(); compilerLogLevel('INFO'); const base_relative_path = '../../../../..'; -const circuit_main = 'compiler/integration-tests/circuits/main'; +const circuit_main = 'test_programs/execution_success/assert_statement'; const circuit_recursion = 'compiler/integration-tests/circuits/recursion'; function getCircuit(noirSource: string): CompiledProgram { diff --git a/compiler/integration-tests/test/node/smart_contract_verifier.test.ts b/compiler/integration-tests/test/node/smart_contract_verifier.test.ts index db37341b8fe..f9245d98442 100644 --- a/compiler/integration-tests/test/node/smart_contract_verifier.test.ts +++ b/compiler/integration-tests/test/node/smart_contract_verifier.test.ts @@ -18,8 +18,8 @@ const test_cases = [ numPublicInputs: 0, }, { - case: 'compiler/integration-tests/circuits/main', - compiled: 'contracts/main.sol:UltraVerifier', + case: 'test_programs/execution_success/assert_statement', + compiled: 'contracts/assert_statement.sol:UltraVerifier', numPublicInputs: 1, }, ];