Skip to content

Commit

Permalink
revert merge
Browse files Browse the repository at this point in the history
  • Loading branch information
rob-maron committed Oct 4, 2023
1 parent eb8bd4d commit a8ef49a
Show file tree
Hide file tree
Showing 12 changed files with 483 additions and 470 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build, Lint, and Test
name: Build and Test Workflow

on:
push:
Expand Down Expand Up @@ -43,10 +43,6 @@ jobs:
sudo apt-get install -y protobuf-compiler
cargo install just
- name: Run linting
run: |
just ${{ matrix.just_variants }} lint
- name: Build all crates in workspace
run: just ${{ matrix.just_variants }} build

Expand Down
42 changes: 42 additions & 0 deletions .github/workflows/lints.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Lints Workflow

on:
push:
branches:
- 'main'
pull_request:
branches:
- 'main'
- '*/*'
workflow_dispatch:

jobs:
lints:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: styfle/[email protected]
name: Cancel Outdated Builds
with:
all_but_latest: true
access_token: ${{ github.token }}

- name: Install Nix
uses: cachix/install-nix-action@v23

- uses: actions/checkout@v4
name: Checkout Repository

- uses: Swatinem/rust-cache@v2
name: Enable Rust Caching
with:
shared-key: ""
prefix-key: lint

- name: Format Check
run: cargo fmt -- --check

- name: Clippy
run: |
nix develop -c just async_std lint
nix develop -c just tokio lint
55 changes: 19 additions & 36 deletions Cargo.lock

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

5 changes: 0 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ either = { version = "1.8" }
espresso-systems-common = { git = "https://github.com/espressosystems/espresso-systems-common", tag = "0.4.1" }
ethereum-types = { version = "0.14.1", features = ["impl-serde"] }
futures = "0.3.28"

# TODO generic-array should not be a direct dependency
# https://github.com/EspressoSystems/HotShot/issues/1850
generic-array = { version = "0.14.7", features = ["serde"] }

jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish" }
jf-relation = { git = "https://github.com/EspressoSystems/jellyfish" }
jf-utils = { git = "https://github.com/espressosystems/jellyfish" }
Expand Down
2 changes: 1 addition & 1 deletion crates/hotshot-qc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ark-std = { workspace = true }
bincode = { workspace = true }
bitvec = { workspace = true }
ethereum-types = { workspace = true }
generic-array = { workspace = true }
generic-array = "0.14.7"
hotshot-types = { path = "../types" }
jf-primitives = { workspace = true }
jf-relation = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/hotshot-stake-table/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ bitvec = { workspace = true }
digest = { workspace = true }
displaydoc = { version = "0.2.3", default-features = false }
ethereum-types = { workspace = true }
generic-array = { workspace = true }
generic-array = "0.14.7"
hotshot-types = { path = "../types" }
jf-primitives = { workspace = true }
jf-relation = { workspace = true }
Expand Down
Loading

0 comments on commit a8ef49a

Please sign in to comment.