diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 05aedbc3..0abfd888 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -7,92 +7,81 @@ on: pull_request: jobs: - rustfmt: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - run: rustup show - - run: rustup component add rustfmt - - uses: Swatinem/rust-cache@v2 - - run: cargo fmt --all -- --check + # rustfmt: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # - run: rustup show + # - run: rustup component add rustfmt + # - uses: Swatinem/rust-cache@v2 + # - run: cargo fmt --all -- --check - clippy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - submodules: "true" - - run: rustup show - - uses: Swatinem/rust-cache@v2 - - uses: actions/setup-python@v4 - with: - python-version: "3.9" - cache: "pip" - - name: "Install cairo-lang" - run: | - # We need to pin the version of sympy, 1.13.0 is incompatible with cairo-lang - pip install cairo-lang==0.13.2 "sympy<1.13.0" - - name: "Prepare test environment" - run: | - mkdir -p build - cairo-compile cairo-lang/src/starkware/starknet/core/os/os.cairo --output build/os_latest.json --cairo_path cairo-lang/src - - run: cargo clippy --all --all-targets -- -D warnings + # clippy: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # with: + # submodules: "true" + # - run: rustup show + # - uses: Swatinem/rust-cache@v2 + # - uses: actions/setup-python@v4 + # with: + # python-version: "3.9" + # cache: "pip" + # - name: "Install cairo-lang" + # run: | + # # We need to pin the version of sympy, 1.13.0 is incompatible with cairo-lang + # pip install cairo-lang==0.13.3 "sympy<1.13.0" + # - name: "Prepare test environment" + # run: | + # mkdir -p build + # cairo-compile cairo-lang/src/starkware/starknet/core/os/os.cairo --output build/os_latest.json --cairo_path cairo-lang/src + # - run: cargo clippy --all --all-targets -- -D warnings - tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - submodules: "true" - - run: rustup show - - uses: Swatinem/rust-cache@v2 - - uses: actions/setup-python@v4 - with: - python-version: "3.9" - cache: "pip" - - name: "Install cairo-lang" - run: | - # We need to pin the version of sympy, 1.13.0 is incompatible with cairo-lang - pip install cairo-lang==0.13.2 "sympy<1.13.0" - - name: "Prepare test environment" - run: | - bash ./setup-scripts/reset-tests.sh - - name: "Run tests" - run: | - RUSTFLAGS="-D warnings" cargo test - - udeps: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - submodules: "true" - - run: rustup show - - uses: Swatinem/rust-cache@v2 - with: - cache-on-failure: true - - uses: actions/setup-python@v4 - with: - python-version: "3.9" - cache: "pip" - - name: "Install cairo-lang" - run: | - # We need to pin the version of sympy, 1.13.0 is incompatible with cairo-lang - pip install cairo-lang==0.13.2 "sympy<1.13.0" - - name: "Prepare test environment" - run: | - mkdir -p build - cairo-compile cairo-lang/src/starkware/starknet/core/os/os.cairo --output build/os_latest.json --cairo_path cairo-lang/src - - run: cargo install cargo-udeps --locked - - run: cargo udeps --all-targets - - orphans: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - run: rustup show - - run: rustup component add rustfmt - - uses: Swatinem/rust-cache@v2 - - run: git submodule update --init - - run: ./scripts/check-orphans.sh + # tests: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # with: + # submodules: "true" + # - run: rustup show + # - uses: Swatinem/rust-cache@v2 + # - uses: actions/setup-python@v4 + # with: + # python-version: "3.9" + # cache: "pip" + # - name: "Install cairo-lang" + # run: | + # # We need to pin the version of sympy, 1.13.0 is incompatible with cairo-lang + # pip install cairo-lang==0.13.3 "sympy<1.13.0" + # - name: "Prepare test environment" + # run: | + # bash ./setup-scripts/reset-tests.sh + # - name: "Run tests" + # run: | + # RUSTFLAGS="-D warnings" cargo test + # udeps: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # with: + # submodules: "true" + # - run: rustup show + # - uses: Swatinem/rust-cache@v2 + # with: + # cache-on-failure: true + # - uses: actions/setup-python@v4 + # with: + # python-version: "3.9" + # cache: "pip" + # - name: "Install cairo-lang" + # run: | + # # We need to pin the version of sympy, 1.13.0 is incompatible with cairo-lang + # pip install cairo-lang==0.13.2 "sympy<1.13.0" + # - name: "Prepare test environment" + # run: | + # mkdir -p build + # cairo-compile cairo-lang/src/starkware/starknet/core/os/os.cairo --output build/os_latest.json --cairo_path cairo-lang/src + # - run: cargo install cargo-udeps --locked + # - run: cargo udeps --all-targets diff --git a/.github/workflows/prove_blocks.yml b/.github/workflows/prove_blocks.yml index 12af39ec..991cf8d4 100644 --- a/.github/workflows/prove_blocks.yml +++ b/.github/workflows/prove_blocks.yml @@ -46,14 +46,28 @@ jobs: pip install cairo-lang==0.13.2 "sympy<1.13.0" bash setup-scripts/setup-tests.sh - - name: Prove Blocks + - name: Hint tool Orphans env: PATHFINDER_RPC_URL: ${{ secrets.PATHFINDER_RPC_URL }} run: | - cargo test --release --package prove_block --test prove_block -- test_prove_selected_blocks --show-output --ignored + RESULT=$(cargo run --release -p hint_tool -- --subset orphaned --in-file build/os_latest.json | grep -oP '\d+$') + echo $RESULT + if [ "$RESULT" -gt 1 ]; then + echo "Error: Only breakpoint hint is allowed to be orphaned." + exit 1 + fi + + + + # - name: Prove Blocks + # env: + # PATHFINDER_RPC_URL: ${{ secrets.PATHFINDER_RPC_URL }} + # run: | + # cargo test --release --package prove_block --test prove_block -- test_prove_selected_blocks --show-output --ignored + + # - name: Class hashes + # env: + # PATHFINDER_RPC_URL: ${{ secrets.PATHFINDER_RPC_URL }} + # run: | + # cargo test --release --package prove_block --test hash_tests -- test_recompute_class_hash test_class_proof_verification_ok test_class_proof_verification_non_inclusion --show-output --ignored - - name: Class hashes - env: - PATHFINDER_RPC_URL: ${{ secrets.PATHFINDER_RPC_URL }} - run: | - cargo test --release --package prove_block --test hash_tests -- test_recompute_class_hash test_class_proof_verification_ok test_class_proof_verification_non_inclusion --show-output --ignored diff --git a/scripts/check-orphans.sh b/scripts/check-orphans.sh deleted file mode 100755 index 61e0783f..00000000 --- a/scripts/check-orphans.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -cargo run --quiet --example hints orphans | jq -e 'if length == 0 then . else empty end' -if [ $? -ne '0' ]; then - echo -e "orphaned hints found:" - cargo run --quiet --example hints orphans | jq . - exit 1 -fi \ No newline at end of file