Skip to content
This repository has been archived by the owner on Jul 5, 2024. It is now read-only.

Introduce the Root Circuit to the integration tests #1471

Merged
merged 19 commits into from
Jun 20, 2023
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@ on:
push:
branches:
- main
workflow_dispatch:
workflow_dispatch:
inputs:
provertype:
description: 'invoke real vs mock prover'
description: 'invoke real vs mock prover (with or without root)'
required: true
default: 'mock_prover'
default: 'sub_mock_prover'
type: choice
options:
- real_prover
- mock_prover
- sub_real_prover
- sub_mock_prover
- root_mock_prover
- root_real_prover

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -36,12 +38,18 @@ jobs:
- id: set-outputs
name: Select instance and prover type
run: |
if [ "${{ github.event.inputs.provertype }}" = "real_prover" ] || [ "${{ github.event_name }}" = "schedule" ]; then
if [ "${{ github.event.inputs.provertype }}" = "root_real_prover" ] || [ "${{ github.event_name }}" = "schedule" ]; then
echo "instancetype=r6i.32xlarge" >> "$GITHUB_OUTPUT"
echo "provertype=real_prover" >> "$GITHUB_OUTPUT"
elif [ "${{ github.event.inputs.provertype }}" = "mock_prover" ] || [ -z ${{ github.event.inputs.provertype }} ]; then
echo "provertype=root_real_prover" >> "$GITHUB_OUTPUT"
elif [ "${{ github.event.inputs.provertype }}" = "root_mock_prover" ]; then
echo "instancetype=r6i.32xlarge" >> "$GITHUB_OUTPUT"
echo "provertype=root_mock_prover" >> "$GITHUB_OUTPUT"
elif [ "${{ github.event.inputs.provertype }}" = "sub_real_prover" ]; then
echo "instancetype=r6i.32xlarge" >> "$GITHUB_OUTPUT"
echo "provertype=sub_real_prover" >> "$GITHUB_OUTPUT"
elif [ "${{ github.event.inputs.provertype }}" = "sub_mock_prover" ] || [ -z ${{ github.event.inputs.provertype }} ]; then
echo "instancetype=c5.9xlarge" >> "$GITHUB_OUTPUT"
echo "provertype=mock_prover" >> "$GITHUB_OUTPUT"
echo "provertype=sub_mock_prover" >> "$GITHUB_OUTPUT"
else
exit 1
fi
Expand Down Expand Up @@ -73,7 +81,7 @@ jobs:
restore-keys: |
${{ runner.os }}-go-
- name: Cargo cache
uses: actions/cache@v3
uses: actions/cache@v3
with:
path: |
~/.cargo/bin/
Expand All @@ -82,7 +90,7 @@ jobs:
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
# Run an initial build in a separate step to split the build time from execution time
# Run an initial build in a separate step to split the build time from execution time
- name: Build bins
run: cargo build --bin gen_blockchain_data
- name: Build tests
Expand Down
87 changes: 85 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bus-mapping/src/circuit_input_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ impl Default for CircuitsParams {
// TODO: Check whether this value is correct or we should increase/decrease based on
// this lib tests
max_copy_rows: 1000,
max_exp_steps: 1000,
max_exp_steps: 1000 / 7, // exp_circuit::OFFSET_INCREMENT = 7
max_bytecode: 512,
max_evm_rows: 0,
max_keccak_rows: 0,
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e

ARG_DEFAULT_SUDO=
ARG_DEFAULT_STEPS="setup gendata tests cleanup"
ARG_DEFAULT_TESTS="rpc circuit_input_builder circuits::mock_prover"
ARG_DEFAULT_TESTS="rpc circuit_input_builder circuits::sub_mock_prover"

usage() {
cat >&2 << EOF
Expand Down
Loading