logos-co
/
nomos-node
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rust 1.79 stable (#661) 

* Rust 1.79 clippy fix

* Rust 1.79 stable in ci and docker

* Allow unused_var in nomos tests

Clippy struggle to recognize the usage of enumeration variable inside one particular testcase.
This commit is contained in:
gusto 2024-06-18 10:53:56 +03:00 committed by GitHub
parent 572d286f5f
commit b4b24e4678
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,6 +1,6 @@
# BUILD IMAGE --------------------------------------------------------- # BUILD IMAGE ---------------------------------------------------------
FROM rust:1.78.0-slim-bullseye AS builder FROM rust:1.79.0-slim-bullseye AS builder
WORKDIR /nomos WORKDIR /nomos
COPY . . COPY . .

2
ci/Dockerfile
View File

@ -1,4 +1,4 @@
FROM rust:1.76.0-slim-bullseye FROM rust:1.79.0-slim-bullseye
LABEL maintainer="augustinas@status.im" \ LABEL maintainer="augustinas@status.im" \
source="https://github.com/logos-co/nomos-node" \ source="https://github.com/logos-co/nomos-node" \

4
shell.nix
View File

@ -6,7 +6,7 @@
overlays = [ overlays = [
(import (fetchGit { (import (fetchGit {
url = "https://github.com/oxalica/rust-overlay.git"; url = "https://github.com/oxalica/rust-overlay.git";
rev = "0e031ddb3f5a339dc6eda93d271ae43618b14eec"; rev = "419e7fae2731f41dd9b3e34dfe8802be68558b92";
})) }))
]; ];
} }
@ -17,7 +17,7 @@ pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
pkg-config pkg-config
rust-bin.stable."1.76.0".default rust-bin.stable."1.79.0".default
clang_14 clang_14
llvmPackages_14.libclang llvmPackages_14.libclang
openssl openssl

2
testnet/Dockerfile
View File

@ -1,6 +1,6 @@
# BUILD IMAGE --------------------------------------------------------- # BUILD IMAGE ---------------------------------------------------------
FROM rust:1.78.0-slim-bullseye AS builder FROM rust:1.79.0-slim-bullseye AS builder
WORKDIR /nomos WORKDIR /nomos
COPY . . COPY . .

6
tests/src/nodes/nomos.rs
View File

@ -250,12 +250,12 @@ impl Node for NomosNode {
chain_start_time: OffsetDateTime::now_utc(), chain_start_time: OffsetDateTime::now_utc(),
}; };
#[allow(unused_mut)] #[allow(unused_mut, unused_variables)]
let mut configs = ids let mut configs = ids
.into_iter() .into_iter()
.zip(coins) .zip(coins)
.enumerate() .enumerate()
.map(|(_i, (da_id, coin))| { .map(|(i, (da_id, coin))| {
create_node_config( create_node_config(
da_id, da_id,
genesis_state.clone(), genesis_state.clone(),
@ -265,7 +265,7 @@ impl Node for NomosNode {
#[cfg(feature = "mixnet")] #[cfg(feature = "mixnet")]
MixnetConfig { MixnetConfig {
mixclient: mixclient_config.clone(), mixclient: mixclient_config.clone(),
mixnode: mixnode_configs[_i].clone(), mixnode: mixnode_configs[i].clone(),
}, },
) )
}) })