From 5a35068c8782e83f44ca3b4f98e93f3fb7d3689b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Tue, 7 May 2024 15:52:53 +0100 Subject: [PATCH] fixing clippy issues in the workspace --- common/client-core/Cargo.toml | 4 ++-- .../mixnet/delegators/delegate_to_multiple_mixnodes.rs | 2 +- common/nymcoconut/src/scheme/aggregation.rs | 4 ++-- common/nymcoconut/src/scheme/mod.rs | 6 +++--- gateway/src/helpers.rs | 1 + 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/common/client-core/Cargo.toml b/common/client-core/Cargo.toml index 464cd9d25a..2f14a5b02a 100644 --- a/common/client-core/Cargo.toml +++ b/common/client-core/Cargo.toml @@ -3,7 +3,7 @@ name = "nym-client-core" version = "1.1.15" authors = ["Dave Hrycyszyn "] edition = "2021" -rust-version = "1.66" +rust-version = "1.70" license.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -48,7 +48,7 @@ nym-validator-client = { path = "../client-libs/validator-client", default-featu nym-task = { path = "../task" } nym-credential-storage = { path = "../credential-storage" } nym-network-defaults = { path = "../network-defaults" } -nym-client-core-config-types = { path = "./config-types", features = ["disk-persistence"]} +nym-client-core-config-types = { path = "./config-types", features = ["disk-persistence"] } nym-client-core-surb-storage = { path = "./surb-storage" } nym-client-core-gateways-storage = { path = "./gateways-storage" } diff --git a/common/commands/src/validator/mixnet/delegators/delegate_to_multiple_mixnodes.rs b/common/commands/src/validator/mixnet/delegators/delegate_to_multiple_mixnodes.rs index 068b24c5d2..787d27a56e 100644 --- a/common/commands/src/validator/mixnet/delegators/delegate_to_multiple_mixnodes.rs +++ b/common/commands/src/validator/mixnet/delegators/delegate_to_multiple_mixnodes.rs @@ -157,7 +157,7 @@ async fn fetch_delegation_data( // If a pending undelegate tx is found, remove it from delegation map Undelegate { owner, mix_id, .. } => { if owner == address.as_ref() - && existing_delegation_map.get(&mix_id.to_string()).is_some() + && existing_delegation_map.contains_key(&mix_id.to_string()) { existing_delegation_map.remove(&mix_id.to_string()); } diff --git a/common/nymcoconut/src/scheme/aggregation.rs b/common/nymcoconut/src/scheme/aggregation.rs index c6e71d7c03..c97fd4b8ad 100644 --- a/common/nymcoconut/src/scheme/aggregation.rs +++ b/common/nymcoconut/src/scheme/aggregation.rs @@ -231,7 +231,7 @@ mod tests { #[test] fn signature_aggregation_works_for_any_subset_of_signatures() { - let mut params = Parameters::new(2).unwrap(); + let params = Parameters::new(2).unwrap(); random_scalars_refs!(attributes, params, 2); let keypairs = ttp_keygen(¶ms, 3, 5).unwrap(); @@ -248,7 +248,7 @@ mod tests { let sigs = sks .iter() - .map(|sk| sign(&mut params, sk, &attributes).unwrap()) + .map(|sk| sign(¶ms, sk, &attributes).unwrap()) .collect::>(); // aggregating (any) threshold works diff --git a/common/nymcoconut/src/scheme/mod.rs b/common/nymcoconut/src/scheme/mod.rs index 026afe634b..691a8dc064 100644 --- a/common/nymcoconut/src/scheme/mod.rs +++ b/common/nymcoconut/src/scheme/mod.rs @@ -426,13 +426,13 @@ mod tests { #[test] fn verification_on_two_public_attributes() { - let mut params = Parameters::new(2).unwrap(); + let params = Parameters::new(2).unwrap(); random_scalars_refs!(attributes, params, 2); let keypair1 = keygen(¶ms); let keypair2 = keygen(¶ms); - let sig1 = sign(&mut params, keypair1.secret_key(), &attributes).unwrap(); - let sig2 = sign(&mut params, keypair2.secret_key(), &attributes).unwrap(); + let sig1 = sign(¶ms, keypair1.secret_key(), &attributes).unwrap(); + let sig2 = sign(¶ms, keypair2.secret_key(), &attributes).unwrap(); assert!(verify( ¶ms, diff --git a/gateway/src/helpers.rs b/gateway/src/helpers.rs index 24f7978e09..d63cc2e394 100644 --- a/gateway/src/helpers.rs +++ b/gateway/src/helpers.rs @@ -49,6 +49,7 @@ pub fn override_network_requester_config( let Some(opts) = opts else { return cfg }; // in the old code we had calls to `assert` thus panicking + #[allow(clippy::expect_used)] cfg.base .try_apply_traffic_modes( cfg.network_requester.disable_poisson_rate,