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.

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

chore: Fix new clippy lints #9114

Merged
merged 5 commits into from
Jan 14, 2025
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
3 changes: 0 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE/release-checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,6 @@ cargo release replace --verbose --execute --allow-branch '*' --package zebrad
cargo release commit --verbose --execute --allow-branch '*'
```

Crate publishing is [automatically checked in CI](https://github.com/ZcashFoundation/zebra/actions/workflows/release-crates-io.yml) using "dry run" mode, however due to a bug in `cargo-release` we need to pass exact versions to the alpha crates:

- [ ] Update `zebra-scan` and `zebra-grpc` alpha crates in the [release-crates-dry-run workflow script](https://github.com/ZcashFoundation/zebra/blob/main/.github/workflows/scripts/release-crates-dry-run.sh)
- [ ] Push the above version changes to the release branch.

## Update End of Support
Expand Down
28 changes: 0 additions & 28 deletions .github/workflows/release-crates-io.patch.yml

This file was deleted.

126 changes: 0 additions & 126 deletions .github/workflows/release-crates-io.yml

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/scripts/release-crates-dry-run.sh

This file was deleted.

28 changes: 14 additions & 14 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4626,7 +4626,7 @@ dependencies = [

[[package]]
name = "tower-batch-control"
version = "0.2.41-beta.19"
version = "0.2.41-beta.20"
dependencies = [
"color-eyre",
"ed25519-zebra",
Expand All @@ -4649,7 +4649,7 @@ dependencies = [

[[package]]
name = "tower-fallback"
version = "0.2.41-beta.19"
version = "0.2.41-beta.20"
dependencies = [
"futures-core",
"pin-project",
Expand Down Expand Up @@ -5718,7 +5718,7 @@ dependencies = [

[[package]]
name = "zebra-chain"
version = "1.0.0-beta.43"
version = "1.0.0-beta.44"
dependencies = [
"bitflags 2.6.0",
"bitflags-serde-legacy",
Expand Down Expand Up @@ -5783,7 +5783,7 @@ dependencies = [

[[package]]
name = "zebra-consensus"
version = "1.0.0-beta.43"
version = "1.0.0-beta.44"
dependencies = [
"bellman",
"blake2b_simd",
Expand Down Expand Up @@ -5829,7 +5829,7 @@ dependencies = [

[[package]]
name = "zebra-grpc"
version = "0.1.0-alpha.10"
version = "0.1.0-alpha.11"
dependencies = [
"color-eyre",
"futures-util",
Expand All @@ -5851,7 +5851,7 @@ dependencies = [

[[package]]
name = "zebra-network"
version = "1.0.0-beta.43"
version = "1.0.0-beta.44"
dependencies = [
"bitflags 2.6.0",
"byteorder",
Expand Down Expand Up @@ -5892,7 +5892,7 @@ dependencies = [

[[package]]
name = "zebra-node-services"
version = "1.0.0-beta.43"
version = "1.0.0-beta.44"
dependencies = [
"color-eyre",
"jsonrpc-core",
Expand All @@ -5905,7 +5905,7 @@ dependencies = [

[[package]]
name = "zebra-rpc"
version = "1.0.0-beta.43"
version = "1.0.0-beta.44"
dependencies = [
"base64 0.22.1",
"chrono",
Expand Down Expand Up @@ -5946,7 +5946,7 @@ dependencies = [

[[package]]
name = "zebra-scan"
version = "0.1.0-alpha.12"
version = "0.1.0-alpha.13"
dependencies = [
"bls12_381",
"chrono",
Expand Down Expand Up @@ -5992,7 +5992,7 @@ dependencies = [

[[package]]
name = "zebra-script"
version = "1.0.0-beta.43"
version = "1.0.0-beta.44"
dependencies = [
"hex",
"lazy_static",
Expand All @@ -6004,7 +6004,7 @@ dependencies = [

[[package]]
name = "zebra-state"
version = "1.0.0-beta.43"
version = "1.0.0-beta.44"
dependencies = [
"bincode",
"chrono",
Expand Down Expand Up @@ -6049,7 +6049,7 @@ dependencies = [

[[package]]
name = "zebra-test"
version = "1.0.0-beta.43"
version = "1.0.0-beta.44"
dependencies = [
"color-eyre",
"futures",
Expand Down Expand Up @@ -6077,7 +6077,7 @@ dependencies = [

[[package]]
name = "zebra-utils"
version = "1.0.0-beta.43"
version = "1.0.0-beta.44"
dependencies = [
"color-eyre",
"hex",
Expand Down Expand Up @@ -6108,7 +6108,7 @@ dependencies = [

[[package]]
name = "zebrad"
version = "2.1.0"
version = "2.1.1"
dependencies = [
"abscissa_core",
"atty",
Expand Down
2 changes: 1 addition & 1 deletion book/src/user/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ docker run -d --platform linux/amd64 \
### Build it locally

```shell
git clone --depth 1 --branch v2.1.0 https://github.com/ZcashFoundation/zebra.git
git clone --depth 1 --branch v2.1.1 https://github.com/ZcashFoundation/zebra.git
docker build --file docker/Dockerfile --target runtime --tag zebra:local .
docker run --detach zebra:local
```
Expand Down
4 changes: 2 additions & 2 deletions book/src/user/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ To compile Zebra directly from GitHub, or from a GitHub release source archive:
```sh
git clone https://github.com/ZcashFoundation/zebra.git
cd zebra
git checkout v2.1.0
git checkout v2.1.1
```

3. Build and Run `zebrad`
Expand All @@ -89,7 +89,7 @@ target/release/zebrad start
### Compiling from git using cargo install

```sh
cargo install --git https://github.com/ZcashFoundation/zebra --tag v2.1.0 zebrad
cargo install --git https://github.com/ZcashFoundation/zebra --tag v2.1.1 zebrad
```

### Compiling on ARM
Expand Down
6 changes: 3 additions & 3 deletions tower-batch-control/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tower-batch-control"
version = "0.2.41-beta.19"
version = "0.2.41-beta.20"
authors = ["Zcash Foundation <[email protected]>", "Tower Maintainers <[email protected]>"]
description = "Tower middleware for batch request processing"
# # Legal
Expand Down Expand Up @@ -43,10 +43,10 @@ rand = "0.8.5"

tokio = { version = "1.42.0", features = ["full", "tracing", "test-util"] }
tokio-test = "0.4.4"
tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.19" }
tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.20" }
tower-test = "0.4.0"

zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.43" }
zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.44" }

[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] }
4 changes: 2 additions & 2 deletions tower-fallback/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tower-fallback"
version = "0.2.41-beta.19"
version = "0.2.41-beta.20"
authors = ["Zcash Foundation <[email protected]>"]
description = "A Tower service combinator that sends requests to a first service, then retries processing on a second fallback service if the first service errors."
license = "MIT OR Apache-2.0"
Expand All @@ -24,4 +24,4 @@ tracing = "0.1.41"
[dev-dependencies]
tokio = { version = "1.42.0", features = ["full", "tracing", "test-util"] }

zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.43" }
zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.44" }
Loading
Loading