Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Renamings { wp1, sp1 } -> sphinx #7

Merged
merged 6 commits into from
Jun 3, 2024
Merged

chore: Renamings { wp1, sp1 } -> sphinx #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cbde99b
chore: move URLs wormhole-foundation -> wp1
huitseeker Jun 3, 2024
f9da536
refactor: rename wp1 -> sphinx
huitseeker Jun 3, 2024
5c6e483
chore: rename SP1 -> Sphinx
huitseeker Jun 3, 2024
0056c45
chore: delete book
huitseeker Jun 3, 2024
3afbe6d
chore: more renamings
huitseeker Jun 3, 2024
261974d
ci: rename wp1 -> sphinx
huitseeker Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .config/nextest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limited = { max-threads = 4 }
very-limited = { max-threads = 1 }

[[profile.ci.overrides]]
filter = '(test(syscall::precompiles) | test(stark::machine) | package(wp1-recursion-program) | package(wp1-recursion-circuit))'
filter = '(test(syscall::precompiles) | test(stark::machine) | package(sphinx-recursion-program) | package(sphinx-recursion-circuit))'
test-group = 'limited'

[[profile.ci.overrides]]
Expand Down
138 changes: 0 additions & 138 deletions .github/workflows/book.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:

[[ "$target" == *windows* ]] && exe=".exe"

RUSTFLAGS='-C target-feature=+crt-static' cargo build --release -p wp1-cli --target "$target" "${flags[@]}"
RUSTFLAGS='-C target-feature=+crt-static' cargo build --release -p sphinx-cli --target "$target" "${flags[@]}"

bins=(cargo-prove)
for name in "${bins[@]}"; do
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ jobs:
uses: ./.github/actions/setup
with:
pull_token: ${{ secrets.REPO_TOKEN }}
- name: Run cargo test on wp1 except the test_e2e_prove_groth16 recursion test
- name: Run cargo test on sphinx except the test_e2e_prove_groth16 recursion test
run: |
cargo nextest run --cargo-profile dev-ci --profile ci --workspace --exclude wp1-recursion-circuit -E 'all() - test(test_e2e_prove_groth16)'
cargo nextest run --cargo-profile dev-ci --profile ci --workspace -E 'all() - test(test_e2e_prove_groth16)'
- name: Run cargo test with no default features
run: |
cargo nextest run -p wp1-core --cargo-profile dev-ci --profile ci --no-default-features --features debug -- cpu::trace::tests::generate_trace
cargo nextest run -p sphinx-core --cargo-profile dev-ci --profile ci --no-default-features --features debug -- cpu::trace::tests::generate_trace
working-directory: ${{ github.workspace }}/examples
- name: Install `cargo prove` CLI
run: |
cargo install --locked --path ./cli
cargo install --locked --force --path ./cli
cargo prove install-toolchain
working-directory: ${{ github.workspace }}

Expand All @@ -51,7 +51,7 @@ jobs:
pull_token: ${{ secrets.PRIVATE_PULL_TOEKN }}
- name: Run cargo test on the recursion circuit
run: |
cargo nextest run --cargo-profile dev-ci --profile ci -p wp1-recursion-circuit
cargo nextest run --cargo-profile dev-ci --profile ci -p sphinx-recursion-circuit

clippy:
runs-on: warp-ubuntu-latest-x64-16x
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
perf: false
- name: Install `cargo prove` CLI
run: |
cargo install --locked --path ./cli
cargo install --locked --force --path ./cli
cargo prove install-toolchain
working-directory: ${{ github.workspace }}
- name: Check examples
Expand All @@ -118,17 +118,17 @@ jobs:
cd cargo-prove-test/program
cat << EOF | tee -a Cargo.toml

[patch.'ssh://git@github.com/lurk-lab/wp1.git']
wp1-zkvm = { path = "../../zkvm/entrypoint" }
[patch.'ssh://git@github.com/lurk-lab/sphinx.git']
sphinx-zkvm = { path = "../../zkvm/entrypoint" }
EOF
cd ../..

cd cargo-prove-test/script
cat << EOF | tee -a Cargo.toml

[patch.'ssh://git@github.com/lurk-lab/sphinx.git']
wp1-sdk = { path = "../../sdk" }
wp1-helper = { path = "../../helper" }
sphinx-sdk = { path = "../../sdk" }
sphinx-helper = { path = "../../helper" }
EOF
cargo run --release

Expand All @@ -148,15 +148,15 @@ jobs:
pull_token: ${{ secrets.REPO_TOKEN }}
- name: Install `cargo prove` CLI
run: |
cargo install --locked --path ./cli
cargo install --locked --force --path ./cli
cargo prove install-toolchain
working-directory: ${{ github.workspace }}
- name: Run cargo test on wp1 except the prove_sp1 recursion test
- name: Run cargo test on sphinx except the prove_sp1 recursion test
run: |
cargo nextest run --cargo-profile dev-ci --profile ci -E 'all() - test(test_e2e_prove_groth16)'
- name: Run cargo test with no default features
run: |
cargo nextest run -p wp1-core --cargo-profile dev-ci --profile ci --no-default-features --features debug -- cpu::trace::tests::generate_trace
cargo nextest run -p sphinx-core --cargo-profile dev-ci --profile ci --no-default-features --features debug -- cpu::trace::tests::generate_trace
- name: check examples compile
run: |
for i in $(find ./ -maxdepth 1 -mindepth 1 -type d); do
Expand Down
Loading
Loading