logos-co/nomos-node
1
0
Fork 0
mirror of https://github.com/logos-co/nomos-node.git synced 2026-08-27 09:31:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: update toolchain to 1.88 (#1420)

Browse Source
This commit is contained in:
Antonio
2025-07-04 16:16:18 +02:00
committed by GitHub
parent 20b3dab4c5
commit 44abeabeb7
21 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/code-check.yml
+3 -3
View File
@@ -39,7 +39,7 @@ jobs:
uses: actions-rs/toolchain@88dc2356392166efad76775c878094f4e83ff746 # Version 1.0.6
with:
# The same version must be used in the `.pre-commit-config.yaml` file
toolchain: nightly-2025-03-29
toolchain: nightly-2025-05-09
profile: minimal
components: rustfmt
override: true
@@ -186,7 +186,6 @@ jobs:
with:
key: ${{ github.ref }}->${{ github.workflow }}->${{ github.job }}->${{ join(matrix.os, '_') }}
github-token: ${{ secrets.GITHUB_TOKEN }}
# We build AND run the binaries that are also used in the integration tests later on.
- name: Run the node binary to check the config file validity
uses: actions-rs/cargo@9e120dd99b0fbad1c065f686657e914e76bd7b72 # Version 1.0.1
with:
@@ -197,7 +196,8 @@ jobs:
with:
command: run
args: -p nomos-executor nodes/nomos-executor/config.yaml --check-config
- name: Build binaries with all features # This includes testing feature needed for tests
# This includes testing feature needed for tests
- name: Build binaries with all features
uses: actions-rs/cargo@9e120dd99b0fbad1c065f686657e914e76bd7b72
with:
command: build
.pre-commit-config.yaml
+1 -1
View File
@@ -6,7 +6,7 @@ repos:
# We're running `fmt` with `--all` and `pass_filenames: false` to format the entire workspace at once.
# Otherwise, `pre-commit` passes staged files one by one, which can lead to inconsistent results
# due to, presumably, the lack of full workspace context.
entry: cargo +nightly-2025-03-29 fmt
entry: cargo +nightly-2025-05-09 fmt
pass_filenames: false
- id: clippy
args: ["--all", "--all-targets", "--all-features", "--", "-D", "warnings"]
Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[workspace]
# Make sure any excluded crates are still clipped in our CI. Also, make sure they use the same Clippy and rustc lints we specify in this file down below.
exclude = ["nomos-core/cl", "nomos-core/proof_statements", "nomos-core/risc0_proofs"]
exclude = ["nomos-core/proof_statements", "nomos-core/risc0_proofs"]
members = [
"consensus/cryptarchia-engine",
"consensus/cryptarchia-sync",
@@ -53,7 +53,6 @@ resolver = "2"
bundler = { path = "./nomos-bundler" }
cfgsync = { path = "./testnet/cfgsync" }
chain-service = { path = "./nomos-services/chain-service" }
cl = { path = "./nomos-core/cl" }
common-http-client = { path = "./nodes/nomos-node/http-client" }
cryptarchia-engine = { path = "./consensus/cryptarchia-engine" }
cryptarchia-sync = { path = "./consensus/cryptarchia-sync" }
@@ -199,6 +198,7 @@ missing_assert_message = { level = "allow" }
missing_errors_doc = { level = "allow" }
missing_panics_doc = { level = "allow" }
pattern_type_mismatch = { level = "allow" }
redundant_test_prefix = { level = "allow" }
ref_patterns = { level = "allow" }
renamed_function_params = { level = "allow" }
same_name_method = { level = "allow" }
Dockerfile
+1 -1
View File
@@ -2,7 +2,7 @@
# BUILD IMAGE
# ===========================
FROM rust:1.87.0-slim-bookworm AS builder
FROM rust:1.88.0-slim-bookworm AS builder
LABEL maintainer="augustinas@status.im" \
source="https://github.com/logos-co/nomos-node" \
ci/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM rust:1.87.0-slim-bookworm
FROM rust:1.88.0-slim-bookworm
LABEL maintainer="augustinas@status.im" \
source="https://github.com/logos-co/nomos-node" \
nomos-core/proof_statements/Cargo.toml
+1
View File
@@ -96,6 +96,7 @@ missing_assert_message = { level = "allow" }
missing_errors_doc = { level = "allow" }
missing_panics_doc = { level = "allow" }
pattern_type_mismatch = { level = "allow" }
redundant_test_prefix = { level = "allow" }
ref_patterns = { level = "allow" }
renamed_function_params = { level = "allow" }
same_name_method = { level = "allow" }
nomos-core/risc0_proofs/Cargo.toml
+1
View File
@@ -104,6 +104,7 @@ missing_assert_message = { level = "allow" }
missing_errors_doc = { level = "allow" }
missing_panics_doc = { level = "allow" }
pattern_type_mismatch = { level = "allow" }
redundant_test_prefix = { level = "allow" }
ref_patterns = { level = "allow" }
renamed_function_params = { level = "allow" }
same_name_method = { level = "allow" }
nomos-core/risc0_proofs/proof_of_leadership/Cargo.toml
+1
View File
@@ -102,6 +102,7 @@ missing_assert_message = { level = "allow" }
missing_errors_doc = { level = "allow" }
missing_panics_doc = { level = "allow" }
pattern_type_mismatch = { level = "allow" }
redundant_test_prefix = { level = "allow" }
ref_patterns = { level = "allow" }
renamed_function_params = { level = "allow" }
same_name_method = { level = "allow" }
nomos-da/network/core/src/swarm/executor.rs
+4
View File
@@ -281,6 +281,10 @@ where
handle_replication_event(&self.validation_events_sender, event).await;
}
#[expect(
clippy::cognitive_complexity,
reason = "TODO: Address this at some point"
)]
async fn handle_behaviour_event(
&mut self,
event: ExecutorBehaviourEvent<
nomos-da/network/core/src/swarm/validator.rs
+4
View File
@@ -246,6 +246,10 @@ where
handle_replication_event(&self.validation_events_sender, event).await;
}
#[expect(
clippy::cognitive_complexity,
reason = "TODO: Address this at some point"
)]
async fn handle_behaviour_event(
&mut self,
event: ValidatorBehaviourEvent<
nomos-services/chain-service/src/leadership.rs
+4
View File
@@ -29,6 +29,10 @@ impl Leader {
Self { utxos, sk, config }
}
#[expect(
clippy::cognitive_complexity,
reason = "TODO: Address this at some point"
)]
pub async fn build_proof_for(
&self,
aged_tree: &UtxoTree,
nomos-services/membership/src/lib.rs
+4
View File
@@ -164,6 +164,10 @@ where
Sdp: SdpAdapter,
Backend::Settings: Clone,
{
#[expect(
clippy::cognitive_complexity,
reason = "TODO: Address this at some point"
)]
async fn handle_message(&mut self, msg: MembershipMessage) {
match msg {
MembershipMessage::GetSnapshotAt {
nomos-services/mempool/src/backend/mockpool/mod.rs
-4
View File
@@ -146,10 +146,6 @@ where
}
fn view(&self, _ancestor_hint: BlockId) -> Box<dyn Iterator<Item = Self::Item> + Send> {
#[expect(
clippy::needless_collect,
reason = "We need to have an owned version of the iterator to bypass adding a lifetime bound to the return iterator type"
)]
let pending_items: Vec<Item> = self.pending_items.values().cloned().collect();
Box::new(pending_items.into_iter())
}
nomos-services/sdp/src/lib.rs
+4
View File
@@ -126,6 +126,10 @@ impl<
RuntimeServiceId: Send + Sync + 'static,
> SdpService<Backend, DeclarationAdapter, ServicesAdapter, Metadata, RuntimeServiceId>
{
#[expect(
clippy::cognitive_complexity,
reason = "TODO: Address this at some point"
)]
async fn handle_sdp_message(&mut self, msg: SdpMessage<Backend>) {
match msg {
SdpMessage::Process {
nomos-utils/src/bounded_duration.rs
+1 -1
View File
@@ -42,7 +42,7 @@ pub(crate) trait TimeTag {
fn inner() -> char;
}
pub struct BoundTag<const TAG: char> {}
pub struct BoundTag<const TAG: char>;
impl<const TAG: char> TimeTag for BoundTag<TAG> {
fn inner() -> char {
TAG
rust-toolchain.toml
+1 -1
View File
@@ -9,6 +9,6 @@
# * workflows/code-check.yml (fmt job)
# * .pre-commit-config.yml (fmt hook)
# Then, if there is any new allow-by-default rustc lint introduced/stabilized, add it to the respective entry in our `config.toml`.
channel = "1.87.0"
channel = "1.88.0"
# Even if clippy should be included in the default profile, in some cases it is not installed. So we force it with an explicit declaration.
components = ["clippy"]
shell.nix
+2 -2
View File
@@ -6,7 +6,7 @@
overlays = [
(import (fetchGit {
url = "https://github.com/oxalica/rust-overlay.git";
rev = "0e624f2b1972a34be1a9b35290ed18ea4b419b6f";
rev = "e28ba067a9368286a8bc88b68dc2ca92181a09f0";
}))
];
}
@@ -19,7 +19,7 @@ pkgs.mkShell {
pkg-config
# Updating the version here requires also updating the `rev` version in the `overlays` section above
# with a commit that contains the new version in its manifest
rust-bin.stable."1.87.0".default
rust-bin.stable."1.88.0".default
clang_14
llvmPackages_14.libclang
openssl.dev
testnet/Dockerfile
+1 -1
View File
@@ -1,6 +1,6 @@
# BUILD IMAGE ---------------------------------------------------------
FROM rust:1.87.0-slim-bookworm AS builder
FROM rust:1.88.0-slim-bookworm AS builder
LABEL maintainer="augustinas@status.im" \
source="https://github.com/logos-co/nomos-node" \
testnet/Dockerfile.debug
+3 -3
View File
@@ -1,6 +1,6 @@
# BUILD IMAGE ---------------------------------------------------------
FROM rust:1.87.0-slim-bookworm AS builder
FROM rust:1.88.0-slim-bookworm AS builder
# Install dependencies needed for building RocksDB and etcd.
RUN apt-get update && apt-get install -yq \
@@ -29,8 +29,8 @@ RUN git clone https://github.com/risc0/risc0.git && \
FROM rust:1.87.0-slim-bookworm AS final
LABEL maintainer="romanzac@status.im" \
source="https://github.com/logos-co/nomos" \
description="Nomos testnet debug image"
source="https://github.com/logos-co/nomos" \
description="Nomos testnet debug image"
COPY --from=builder /usr/local/cargo /usr/local/cargo
COPY --from=builder /root/.risc0 /root/.risc0
testnet/cfgsync/src/lib.rs
+1 -1
View File
@@ -27,7 +27,7 @@ mod tests {
};
#[tokio::test]
#[ignore]
#[ignore = "Ignored until mantle related configuration is settled"]
async fn test_address_book() {
let n_hosts = 4;
let config = CfgSyncConfig {
testnet/cfgsync/src/repo.rs
+1 -5
View File
@@ -81,11 +81,7 @@ impl ConfigRepo {
println!("All hosts have announced their IPs");
let mut waiting_hosts = self.waiting_hosts.lock().unwrap();
let hosts = waiting_hosts
.iter()
.map(|(host, _)| host)
.cloned()
.collect();
let hosts = waiting_hosts.keys().cloned().collect();
let configs = create_node_configs(
&self.consensus_params,