Skip to content

Commit

Permalink
Merge branch 'main' into i188-josef-reset-analysis
Browse files Browse the repository at this point in the history
  • Loading branch information
cason committed Jun 24, 2024
2 parents 756972f + 158ec63 commit 2ea16c3
Show file tree
Hide file tree
Showing 191 changed files with 33,007 additions and 1,672 deletions.
1 change: 1 addition & 0 deletions .github/codespell/words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ manuel
numer
ser
shs
widder
8 changes: 2 additions & 6 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Codespell
name: Spelling
on:
pull_request:
push:
Expand All @@ -15,8 +15,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: codespell-project/actions-codespell@v2
with:
skip: './code/target'
ignore_words_file: .github/codespell/words.txt

- uses: crate-ci/typos@master
6 changes: 5 additions & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:
uses: actions/checkout@v4
- name: Install Protoc
uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Setup Node
uses: actions/setup-node@v3
with:
Expand All @@ -47,7 +49,7 @@ jobs:
cargo llvm-cov nextest \
--workspace \
--exclude malachite-itf \
--ignore-filename-regex node/bin \
--ignore-filename-regex crates/cli \
--all-features \
--ignore-run-fail \
--lcov \
Expand Down Expand Up @@ -75,6 +77,8 @@ jobs:
uses: actions/checkout@v4
- name: Install Protoc
uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Setup Node
uses: actions/setup-node@v3
with:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/mbt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ jobs:
uses: actions/checkout@v4
- name: Install Protoc
uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Setup Node
uses: actions/setup-node@v3
with:
Expand All @@ -40,10 +42,10 @@ jobs:
- name: Install cargo-nextest
uses: taiki-e/install-action@cargo-nextest
- name: Build code
working-directory: code/itf
working-directory: code/crates/itf
run: cargo nextest run --workspace --all-features --no-run
- name: Current time as random seed for Quint
run: echo "QUINT_SEED=$(date +%s)" >> $GITHUB_ENV
- name: Run tests from traces (with random seed)
working-directory: code/itf
working-directory: code/crates/itf
run: cargo nextest run -p malachite-itf --all-features
6 changes: 5 additions & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ jobs:
uses: actions/checkout@v4
- name: Install Protoc
uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Setup Node
uses: actions/setup-node@v3
with:
Expand All @@ -56,6 +58,8 @@ jobs:
uses: actions/checkout@v4
- name: Install Protoc
uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Setup Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
Expand Down Expand Up @@ -94,4 +98,4 @@ jobs:
- name: Install cargo-msrv
run: cargo binstall --no-confirm --force [email protected]
- name: Check MSRV
run: cargo msrv verify --output-format minimal --manifest-path code/driver/Cargo.toml -- 'cargo check --all-features'
run: cargo msrv verify --output-format minimal --manifest-path code/crates/driver/Cargo.toml -- 'cargo check --all-features'
2 changes: 2 additions & 0 deletions code/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
target
scripts
1 change: 1 addition & 0 deletions code/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/x
67 changes: 37 additions & 30 deletions code/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,7 @@
resolver = "2"

members = [
"actors",
"cli",
"common",
"driver",
"gossip",
"itf",
"network",
"node",
"proto",
"round",
"test",
"vote",
"crates/*"
]

[workspace.package]
Expand All @@ -24,43 +13,60 @@ license = "Apache-2.0"
publish = false
rust-version = "1.77"

[profile.release]
overflow-checks = true

[profile.profiling]
inherits = "release"
debug = true

[workspace.lints.rust]
# unused_crate_dependencies = "warn"
unused_crate_dependencies = "warn"

[workspace.dependencies]
malachite-actors = { version = "0.1.0", path = "actors" }
malachite-cli = { version = "0.1.0", path = "cli" }
malachite-common = { version = "0.1.0", path = "common" }
malachite-driver = { version = "0.1.0", path = "driver" }
malachite-gossip = { version = "0.1.0", path = "gossip" }
malachite-network = { version = "0.1.0", path = "network" }
malachite-itf = { version = "0.1.0", path = "itf" }
malachite-node = { version = "0.1.0", path = "node" }
malachite-proto = { version = "0.1.0", path = "proto" }
malachite-round = { version = "0.1.0", path = "round" }
malachite-test = { version = "0.1.0", path = "test" }
malachite-vote = { version = "0.1.0", path = "vote" }
malachite-actors = { version = "0.1.0", path = "crates/actors" }
malachite-cli = { version = "0.1.0", path = "crates/cli" }
malachite-common = { version = "0.1.0", path = "crates/common" }
malachite-driver = { version = "0.1.0", path = "crates/driver" }
malachite-gossip-consensus = { version = "0.1.0", path = "crates/gossip-consensus" }
malachite-gossip-mempool = { version = "0.1.0", path = "crates/gossip-mempool" }
malachite-itf = { version = "0.1.0", path = "crates/itf" }
malachite-metrics = { version = "0.1.0", path = "crates/metrics" }
malachite-node = { version = "0.1.0", path = "crates/node" }
malachite-proto = { version = "0.1.0", path = "crates/proto" }
malachite-round = { version = "0.1.0", path = "crates/round" }
malachite-test = { version = "0.1.0", path = "crates/test" }
malachite-test-app = { version = "0.1.0", path = "crates/test-app" }
malachite-vote = { version = "0.1.0", path = "crates/vote" }

async-trait = "0.1.77"
clap = { version = "4.5.4", features = ["derive"] }
axum = "0.7"
base64 = "0.22.0"
bytesize = "1.3"
clap = "4.5.4"
color-eyre = "0.6"
config = { version = "0.14", features = ["toml"], default-features = false }
eyre = "0.6"
derive-where = "1.2.7"
directories = "5.0.1"
ed25519-consensus = "2.1.0"
futures = "0.3"
glob = "0.3.0"
hex = { version = "0.4.3", features = ["serde"] }
humantime = "2.1.0"
humantime-serde = "1.1.1"
itertools = "0.12"
itertools = "0.13"
itf = "0.2.3"
libp2p = { version = "0.53.2", features = ["macros", "mdns", "identify", "tokio", "ed25519", "quic", "tls", "gossipsub"] }
libp2p-gossipsub = { version = "0.46.1" }
libp2p = { version = "0.53.2", features = ["macros", "mdns", "identify", "tokio", "ed25519", "quic", "tls", "gossipsub", "dns", "metrics"] }
multiaddr = "0.18.1"
num-bigint = "0.4.4"
num-traits = "0.2.17"
pretty_assertions = "1.4"
prost = "0.12.3"
prost-build = "0.12.3"
prost-types = "0.12.3"
ractor = "0.9.6"
prometheus-client = "0.22"
ractor = "0.10.0"
ractor_actors = { version = "0.4.0", default-features= false }
rand = { version = "0.8.5", features = ["std_rng"] }
rand_chacha = "0.3.1"
Expand All @@ -75,3 +81,4 @@ tokio-stream = "0.1"
toml = "0.8.10"
tracing = "0.1.40"
tracing-subscriber = "0.3.18"
tempfile = "3.10.1"
64 changes: 0 additions & 64 deletions code/actors/src/cal.rs

This file was deleted.

8 changes: 0 additions & 8 deletions code/actors/src/lib.rs

This file was deleted.

Loading

0 comments on commit 2ea16c3

Please sign in to comment.