Skip to content

Commit

Permalink
chore: remove usage of main program in integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
TomAFrench committed Nov 27, 2023
1 parent cca860a commit 0c75d16
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 18 deletions.
5 changes: 0 additions & 5 deletions compiler/integration-tests/circuits/main/Nargo.toml

This file was deleted.

2 changes: 0 additions & 2 deletions compiler/integration-tests/circuits/main/Prover.toml

This file was deleted.

3 changes: 0 additions & 3 deletions compiler/integration-tests/circuits/main/src/main.nr

This file was deleted.

8 changes: 4 additions & 4 deletions compiler/integration-tests/scripts/codegen-verifiers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const test_cases = [
numPublicInputs: 0,
},
{
case: 'compiler/integration-tests/circuits/main',
case: 'test_programs/execution_success/assert_statement',
numPublicInputs: 1,
},
];
Expand Down
2 changes: 1 addition & 1 deletion compiler/integration-tests/test/browser/recursion.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
];
Expand Down

0 comments on commit 0c75d16

Please sign in to comment.