Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
94 changes: 62 additions & 32 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,45 +3,60 @@ name: Rust
on: [push, pull_request]

jobs:
lint:
name: Lint
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.37.0
override: true

# Ensure all code has been formatted with rustfmt
- run: rustup component add rustfmt
- name: Check formatting
uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check --color always

test:
name: Test on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest]

steps:
- uses: actions/checkout@v1
- name: Check formatting
run: cargo fmt --all -- --check
- name: Build
run: cargo build --verbose --release --all
- name: Run tests
run: cargo test --verbose --release --all
- name: Run slow tests
run: cargo test --verbose --release --all -- --ignored

macOS:
name: Test on macOS-latest
runs-on: macOS-latest
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
- name: Install Rust
run: curl https://sh.rustup.rs -sSf | sh -s -- -y
- name: Install rustfmt
run: $HOME/.cargo/bin/rustup component add rustfmt
- uses: actions/checkout@v1
- name: Check formatting
run: $HOME/.cargo/bin/cargo fmt --all -- --check
- name: Build
run: $HOME/.cargo/bin/cargo build --verbose --release --all
- name: Run tests
run: $HOME/.cargo/bin/cargo test --verbose --release --all
- name: Run slow tests
run: $HOME/.cargo/bin/cargo test --verbose --release --all -- --ignored
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.37.0
override: true
- name: cargo fetch
uses: actions-rs/cargo@v1
with:
command: fetch
- name: Build tests
uses: actions-rs/cargo@v1
with:
command: build
args: --verbose --release --all --tests
- name: Run tests
uses: actions-rs/cargo@v1
with:
command: test
args: --verbose --release --all
- name: Run slow tests
uses: actions-rs/cargo@v1
with:
command: test
args: --verbose --release --all -- --ignored

doc-links:
name: Check intra-doc links
name: Nightly lint
runs-on: ubuntu-latest

steps:
Expand All @@ -50,7 +65,22 @@ jobs:
with:
toolchain: nightly
override: true
- uses: actions-rs/cargo@v1
- name: cargo fetch
uses: actions-rs/cargo@v1
with:
command: fetch

# Ensure intra-documentation links all resolve correctly
# Requires #![deny(intra_doc_link_resolution_failure)] in crates.
- name: Check intra-doc links
uses: actions-rs/cargo@v1
with:
command: doc
args: --document-private-items
args: --all --document-private-items

# Build benchmarks to prevent bitrot
- name: Build benchmarks
uses: actions-rs/cargo@v1
with:
command: build
args: --verbose --all --benches
58 changes: 29 additions & 29 deletions Cargo.lock

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

11 changes: 7 additions & 4 deletions bellman/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ homepage = "https://github.com/ebfull/bellman"
license = "MIT/Apache-2.0"
name = "bellman"
repository = "https://github.com/ebfull/bellman"
version = "0.1.0"
version = "0.2.0"
edition = "2018"

[dependencies]
bit-vec = "0.4.4"
blake2s_simd = "0.5"
ff = { path = "../ff" }
ff = { version = "0.5.0", path = "../ff" }
futures = "0.1"
futures-cpupool = { version = "0.1", optional = true }
group = { path = "../group" }
group = { version = "0.2.0", path = "../group" }
num_cpus = { version = "1", optional = true }
crossbeam = { version = "0.7", optional = true }
pairing = { path = "../pairing", optional = true }
pairing = { version = "0.15.0", path = "../pairing", optional = true }
rand_core = "0.5"
byteorder = "1"

Expand All @@ -38,3 +38,6 @@ default = ["groth16", "multicore"]
name = "mimc"
path = "tests/mimc.rs"
required-features = ["groth16"]

[badges]
maintenance = { status = "actively-developed" }
7 changes: 5 additions & 2 deletions ff/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ff"
version = "0.4.0"
version = "0.5.0"
authors = ["Sean Bowe <ewillbefull@gmail.com>"]
description = "Library for building and interfacing with finite fields"
readme = "README.md"
Expand All @@ -12,9 +12,12 @@ edition = "2018"

[dependencies]
byteorder = "1"
ff_derive = { version = "0.3.0", path = "ff_derive", optional = true }
ff_derive = { version = "0.4.0", path = "ff_derive", optional = true }
rand_core = "0.5"

[features]
default = []
derive = ["ff_derive"]

[badges]
maintenance = { status = "actively-developed" }
5 changes: 4 additions & 1 deletion ff/ff_derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ff_derive"
version = "0.3.0"
version = "0.4.0"
authors = ["Sean Bowe <ewillbefull@gmail.com>"]
description = "Procedural macro library used to build custom prime field implementations"
documentation = "https://docs.rs/ff/"
Expand All @@ -19,3 +19,6 @@ num-integer = "0.1"
proc-macro2 = "1"
quote = "1"
syn = "1"

[badges]
maintenance = { status = "passively-maintained" }
7 changes: 5 additions & 2 deletions group/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "group"
version = "0.1.0"
version = "0.2.0"
authors = [
"Sean Bowe <ewillbefull@gmail.com>",
"Jack Grigg <jack@z.cash>",
Expand All @@ -15,6 +15,9 @@ repository = "https://github.com/ebfull/group"
edition = "2018"

[dependencies]
ff = { path = "../ff" }
ff = { version = "0.5.0", path = "../ff" }
rand = "0.7"
rand_xorshift = "0.2"

[badges]
maintenance = { status = "actively-developed" }
Loading