Fix license

.cargo/config

@@ -6,5 +6,24 @@
 xclippy = [
     "clippy", "--workspace", "--all-targets", "--",
     "-Wclippy::all",
+    "-Wclippy::match_same_arms",
+    "-Wclippy::cast_lossless",
+    "-Wclippy::dbg_macro",
     "-Wclippy::disallowed_methods",
+    "-Wclippy::derive_partial_eq_without_eq",
+    "-Wclippy::enum_glob_use",
+    "-Wclippy::filter_map_next",
+    "-Wclippy::flat_map_option",
+    "-Wclippy::inefficient_to_string",
+    "-Wclippy::large_types_passed_by_value",
+    "-Wclippy::manual_assert",
+    "-Wclippy::manual_ok_or",
+    "-Wclippy::map_flatten",
+    "-Wclippy::map_unwrap_or",
+    "-Wclippy::needless_borrow",
+    "-Wclippy::checked_conversions",
+    "-Wclippy::trait_duplication_in_bounds",
+    "-Wrust_2018_idioms",
+    "-Wtrivial_numeric_casts",
+    "-Wunused_lifetimes",
 ]

.circleci/config.yml

@@ -1,18 +1,13 @@
 version: 2.1
 
 setup-env: &setup-env
-  MSRV: 1.60.0
+  MSRV: 1.70.0
   RUSTFLAGS: "-Dwarnings"
   CARGO_INCREMENTAL: 0
   RUST_BACKTRACE: 1
   RUST_LOG: info
 
 executors:
-  default:
-    machine:
-      image: ubuntu-2004:202101-01
-    working_directory: ~/lurk
-    resource_class: xlarge
   arm64:
     machine:
       image: ubuntu-2004:202101-01
@@ -99,191 +94,47 @@ commands:
             cargo --version
             rustc --version
 
-  save_rustup_cache:
-    steps:
-      - save_cache:
-          name: "Save rustup cache"
-          key: cargo-v2-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
-          paths:
-            - "~/.cargo"
-            - "~/.rustup"
-
-  restore_rustup_cache:
-      steps:
-        - restore_cache:
-            keys:
-              - cargo-v2-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
-
-  install_gpu_deps:
-    steps:
-      - run: sudo apt update && sudo apt install -y ocl-icd-opencl-dev curl build-essential
-
 jobs:
-  cargo_fetch:
-    executor: default
-    environment: *setup-env
+  test:
+    parameters:
+     os:
+       type: executor
+    executor: << parameters.os >>
     steps:
       - checkout
       - run:
           name: Update submodules
           command: |
             git submodule update --init --recursive
-      - restore_rustup_cache
-      - set_env_path
-      - set_versions_n_runners
-      - run: cargo fetch
-      - run: rm -rf .git
-      - persist_to_workspace:
-          root: ~/
-          paths:
-            - lurk
-      - save_rustup_cache
-
-  linux_release:
-    executor: default
-    environment: *setup-env
-    steps:
-      - checkout
       - attach_workspace:
           at: "~/"
-      - restore_rustup_cache
-      - set_env_path
-      - setup-sccache
-      - install_gpu_deps
-      - restore-sccache-cache
-      - run:
-          name: Linux Tests
-          command: cargo nextest run --profile ci --workspace --cargo-profile dev-ci --run-ignored ignored-only -E 'all() - test(groth16::tests::outer_prove_recursion) - test(test_make_fcomm_examples) - test(test_functional_commitments_demo) - test(test_chained_functional_commitments_demo)'
-      - run:
-          name: Benches build successfully
-          command: cargo bench --no-run --profile dev-ci
-      - run:
-          name: Linux Doc Tests
-          command: cargo test --doc --workspace --profile dev-ci
-      - save-sccache-cache
-      - run:
-          name: Print sccache stats
-          command: sccache -s
-
-  linux_exhaustive:
-    executor: default
-    environment: *setup-env
-    steps:
-      - checkout
-      - attach_workspace:
-          at: "~/"
-      - restore_rustup_cache
-      - set_env_path
-      - install_gpu_deps
-      - restore-sccache-cache
-      - run:
-          name: Linux Tests
-          command: cargo nextest run --profile ci --workspace --cargo-profile dev-ci --run-ignored all
-      - run:
-          name: Benches build successfully
-          command: cargo bench --no-run --profile dev-ci
-      - run:
-          name: Linux Doc Tests
-          command: cargo test --doc --workspace --profile dev-ci
-      - save-sccache-cache
-      - run:
-          name: Print sccache stats
-          command: sccache -s
-
-  arm64:
-    executor: arm64
-    environment: *setup-env
-    steps:
-      - checkout
-      - run:
-          name: Update submodules
-          command: |
-            git submodule update --init --recursive
-      - attach_workspace:
-          at: "~/"
-      - set_versions_n_runners
-      - set_env_path
-      - install_gpu_deps
-      - setup-sccache
-      - restore-sccache-cache
-      - run:
-          name: Arm64 Tests
-          command: cargo nextest run --profile ci --workspace --cargo-profile dev-ci
-          no_output_timeout: 120m
-      - run:
-          name: Benches build successfully
-          command: cargo bench --no-run --profile dev-ci
-      - run:
-          name: Arm64 Doc Tests
-          command: cargo test --doc --workspace --profile dev-ci
-      - save-sccache-cache
-      - run:
-          name: Print sccache stats
-          command: sccache -s
-
-  mac:
-    executor: darwin
-    environment: *setup-env
-    steps:
-      - checkout
-      - run:
-          name: Update submodules
-          command: git submodule update --init --recursive
-      - attach_workspace:
-           at: "~/"
       - set_versions_n_runners
       - set_env_path
       - setup-sccache
       - restore-sccache-cache
       - run:
-          name: MacOS Tests
+          name: Run cargo tests
           command: cargo nextest run --profile ci --workspace --cargo-profile dev-ci
           no_output_timeout: 120m
       - run:
           name: Benches build successfully
           command: cargo bench --no-run --profile dev-ci
       - run:
-          name: MacOS Doc Tests
+          name: Doc Tests
           command: cargo test --doc --workspace --profile dev-ci
       - save-sccache-cache
       - run:
           name: Print sccache stats
           command: sccache -s
 
-  clippy:
-    executor: default
-    environment: *setup-env
-    steps:
-      - checkout
-      - set_env_path
-      - attach_workspace:
-          at: "~/"
-      - restore_rustup_cache
-      - run: cargo clippy --all -- -D warnings
-
-  rustfmt:
-    executor: default
-    environment: *setup-env
-    steps:
-      - checkout
-      - set_env_path
-      - attach_workspace:
-          at: "~/"
-      - restore_rustup_cache
-      - run: cargo fmt --all -- --check
 
 workflows:
   test-all:
     jobs:
-      - cargo_fetch:
-          filters:
-            branches:
-                ignore:
-                  - gh-pages
-                  - staging.tmp
-                  - trying.tmp
-                  - staging-squash-merge.tmp
-      - arm64:
+      - test:
+          matrix:
+            parameters:
+              os: [arm64, darwin]
           filters:
             branches:
                 ignore:
@@ -292,58 +143,3 @@ workflows:
                   - staging.tmp
                   - trying.tmp
                   - staging-squash-merge.tmp
-      - mac:
-          filters:
-            branches:
-                ignore:
-                  - master
-                  - gh-pages
-                  - staging.tmp
-                  - trying.tmp
-                  - staging-squash-merge.tmp
-      - linux_release:
-          requires:
-            - cargo_fetch
-          filters:
-            branches:
-                ignore:
-                  - master
-                  - gh-pages
-                  - staging.tmp
-                  - trying.tmp
-                  - staging-squash-merge.tmp
-      - rustfmt:
-          requires:
-            - cargo_fetch
-          filters:
-            branches:
-                ignore:
-                  - master
-                  - gh-pages
-                  - staging.tmp
-                  - trying.tmp
-                  - staging-squash-merge.tmp
-      - clippy:
-          requires:
-            - cargo_fetch
-          filters:
-            branches:
-                ignore:
-                  - master
-                  - gh-pages
-                  - staging.tmp
-                  - trying.tmp
-                  - staging-squash-merge.tmp
-  nightly:
-    triggers:
-        - schedule:
-            cron: "0 0 * * *"
-            filters:
-              branches:
-                only:
-                  - master
-    jobs:
-        - cargo_fetch
-        - linux_exhaustive:
-            requires:
-              - cargo_fetch

.clippy.toml

@@ -1,3 +1,4 @@
+type-complexity-threshold = 999
 too-many-arguments-threshold = 20
 disallowed-methods = [
     # we use strict naming for pasta fields

.config/nextest.toml

@@ -6,5 +6,7 @@ failure-output = "immediate-final"
 status-level = "skip"
 # Do not cancel the test run on the first failure.
 fail-fast = false
-# Mark tests as slow after 5mins, kill them after 50
-slow-timeout = { period = "300s", terminate-after = 10 }
+# Mark tests as slow after 5mins, kill them after 20mins
+slow-timeout = { period = "300s", terminate-after = 4 }
+# Retry failed tests once, marked flaky if test then passes
+retries = 1

.github/workflows/bench_pr_comment.yml

@@ -0,0 +1,65 @@
+# Creates a PR benchmark comment with a comparison to master
+name: Benchmark pull requests
+on:
+  issue_comment:
+    types: [created]
+
+env:
+  CARGO_TERM_COLOR: always
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  run-benchmark:
+    name: run end2end benchmark
+    runs-on: [self-hosted, bench]
+    if:
+      github.event.issue.pull_request
+      && github.event.issue.state == 'open'
+      && contains(github.event.comment.body, '!benchmark')
+      && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER')
+    steps:
+      - uses: xt0rted/pull-request-comment-branch@v2
+        id: comment-branch
+
+      - uses: actions/checkout@v4
+        if: success()
+        with:
+          ref: ${{ steps.comment-branch.outputs.head_ref }}
+      # Set the Rust env vars
+      - uses: actions-rs/toolchain@v1
+      - uses: Swatinem/rust-cache@v2
+      - uses: boa-dev/criterion-compare-action@v3
+        with:
+          # Optional. Compare only this benchmark target
+          benchName: "end2end"
+          # Needed. The name of the branch to compare with
+          branchName: ${{ github.ref_name }}
+
+  gpu-benchmark:
+    name: run fibonacci benchmark on GPU
+    runs-on: [self-hosted, gpu-bench]
+    if:
+      github.event.issue.pull_request
+      && github.event.issue.state == 'open'
+      && contains(github.event.comment.body, '!benchmark')
+      && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER')
+    steps:
+      - uses: xt0rted/pull-request-comment-branch@v2
+        id: comment-branch
+
+      - uses: actions/checkout@v4
+        if: success()
+        with:
+          ref: ${{ steps.comment-branch.outputs.head_ref }}
+      # Set the Rust env vars
+      - uses: actions-rs/toolchain@v1
+      - uses: Swatinem/rust-cache@v2
+      - uses: boa-dev/criterion-compare-action@v3
+        with:
+          # Optional. Compare only this benchmark target
+          benchName: "fibonacci"
+          # Needed. The name of the branch to compare with
+          branchName: ${{ github.ref_name }}