From 297cde513bb288e4534f7fe4bddb5d798b062fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Wed, 27 Mar 2024 16:11:14 +0000 Subject: [PATCH] turns out 'make' doesn't run cargo fmt --- clients/native/websocket-requests/src/text.rs | 1 - .../validator-client/src/nyxd/cosmwasm_client/types.rs | 1 - .../cosmwasm-smart-contracts/mixnet-contract/src/events.rs | 2 +- .../mixnet-contract/src/rewarding/simulator/mod.rs | 1 - common/mixnode-common/src/verloc/packet.rs | 1 - common/nymcoconut/src/elgamal.rs | 2 -- common/nymcoconut/src/proofs/mod.rs | 1 - common/nymcoconut/src/scheme/double_use.rs | 1 - common/nymcoconut/src/scheme/issuance.rs | 2 -- common/nymcoconut/src/scheme/keygen.rs | 2 -- common/nymcoconut/src/scheme/mod.rs | 3 --- common/nymcoconut/src/scheme/verification.rs | 2 -- common/nymcoconut/src/traits.rs | 1 - common/nymcoconut/src/utils.rs | 1 - common/nymsphinx/framing/src/codec.rs | 2 +- common/nymsphinx/framing/src/packet.rs | 1 - common/socks5-client-core/src/socks/mod.rs | 2 -- common/topology/src/serde.rs | 1 - common/types/src/currency.rs | 2 +- contracts/mixnet/src/interval/pending_events.rs | 2 +- contracts/mixnet/src/mixnodes/transactions.rs | 4 +--- contracts/mixnet/src/rewards/queries.rs | 1 - mixnode/src/commands/sign.rs | 1 - nym-api/src/coconut/client.rs | 1 - nym-api/src/coconut/dkg/dealing.rs | 3 ++- nym-api/src/coconut/dkg/key_validation.rs | 5 ++++- nym-api/src/support/storage/manager.rs | 1 - nym-outfox/src/format.rs | 4 ---- nym-outfox/src/packet.rs | 6 +----- 29 files changed, 12 insertions(+), 45 deletions(-) diff --git a/clients/native/websocket-requests/src/text.rs b/clients/native/websocket-requests/src/text.rs index faa0706a55..231fb52229 100644 --- a/clients/native/websocket-requests/src/text.rs +++ b/clients/native/websocket-requests/src/text.rs @@ -8,7 +8,6 @@ use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag; use serde::{Deserialize, Serialize}; - // local text equivalent of `ClientRequest` for easier serialization + deserialization with serde // TODO: figure out if there's an easy way to avoid defining it diff --git a/common/client-libs/validator-client/src/nyxd/cosmwasm_client/types.rs b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/types.rs index b1e91efa39..ceeae0f54e 100644 --- a/common/client-libs/validator-client/src/nyxd/cosmwasm_client/types.rs +++ b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/types.rs @@ -29,7 +29,6 @@ use cosmrs::{AccountId, Any, Coin as CosmosCoin}; use prost::Message; use serde::Serialize; - pub use cosmrs::abci::GasInfo; pub type ContractCodeId = u64; diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs index 444bfc31d7..365adf9df3 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs @@ -96,7 +96,7 @@ impl Display for MixnetEventType { MixnetEventType::GatewayConfigUpdate => "gateway_config_update", }; - write!(f,"{EVENT_VERSION_PREFIX}{event_name}") + write!(f, "{EVENT_VERSION_PREFIX}{event_name}") } } diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/rewarding/simulator/mod.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/rewarding/simulator/mod.rs index e723988c91..0cc4d06dee 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/rewarding/simulator/mod.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/rewarding/simulator/mod.rs @@ -596,7 +596,6 @@ mod tests { #[test] #[allow(clippy::inconsistent_digit_grouping)] fn multiple_nodes_against_known_values() { - // TODO: this test can be further improved by checking values after EVERY interval // rather than just checking the final results diff --git a/common/mixnode-common/src/verloc/packet.rs b/common/mixnode-common/src/verloc/packet.rs index 77b112836e..c5729904b7 100644 --- a/common/mixnode-common/src/verloc/packet.rs +++ b/common/mixnode-common/src/verloc/packet.rs @@ -4,7 +4,6 @@ use crate::verloc::error::RttError; use nym_crypto::asymmetric::identity::{self, PUBLIC_KEY_LENGTH, SIGNATURE_LENGTH}; - pub(crate) struct EchoPacket { sequence_number: u64, sender: identity::PublicKey, diff --git a/common/nymcoconut/src/elgamal.rs b/common/nymcoconut/src/elgamal.rs index 923ffd8be6..55db7dcdd2 100644 --- a/common/nymcoconut/src/elgamal.rs +++ b/common/nymcoconut/src/elgamal.rs @@ -3,8 +3,6 @@ use core::ops::{Deref, Mul}; - - use bls12_381::{G1Projective, Scalar}; use group::Curve; use serde_derive::{Deserialize, Serialize}; diff --git a/common/nymcoconut/src/proofs/mod.rs b/common/nymcoconut/src/proofs/mod.rs index 6de4992fd1..17a8416c59 100644 --- a/common/nymcoconut/src/proofs/mod.rs +++ b/common/nymcoconut/src/proofs/mod.rs @@ -5,7 +5,6 @@ use std::borrow::Borrow; - use bls12_381::{G1Projective, G2Projective, Scalar}; use digest::generic_array::typenum::Unsigned; use digest::Digest; diff --git a/common/nymcoconut/src/scheme/double_use.rs b/common/nymcoconut/src/scheme/double_use.rs index 8817514040..f0a6a1eed3 100644 --- a/common/nymcoconut/src/scheme/double_use.rs +++ b/common/nymcoconut/src/scheme/double_use.rs @@ -7,7 +7,6 @@ use crate::utils::try_deserialize_g2_projective; use bls12_381::{G2Affine, G2Projective}; use group::Curve; - use std::fmt::{Debug, Formatter}; use std::ops::Deref; diff --git a/common/nymcoconut/src/scheme/issuance.rs b/common/nymcoconut/src/scheme/issuance.rs index 3c562d4ec3..088f691f32 100644 --- a/common/nymcoconut/src/scheme/issuance.rs +++ b/common/nymcoconut/src/scheme/issuance.rs @@ -1,8 +1,6 @@ // Copyright 2021 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 - - use std::ops::Neg; use bls12_381::{multi_miller_loop, G1Affine, G1Projective, G2Prepared, Scalar}; diff --git a/common/nymcoconut/src/scheme/keygen.rs b/common/nymcoconut/src/scheme/keygen.rs index 823bc65759..c587ad8fd9 100644 --- a/common/nymcoconut/src/scheme/keygen.rs +++ b/common/nymcoconut/src/scheme/keygen.rs @@ -5,8 +5,6 @@ use core::borrow::Borrow; use core::iter::Sum; use core::ops::{Add, Mul}; - - use bls12_381::{G1Projective, G2Projective, Scalar}; use group::Curve; use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair}; diff --git a/common/nymcoconut/src/scheme/mod.rs b/common/nymcoconut/src/scheme/mod.rs index 4ccec89b18..00adef8826 100644 --- a/common/nymcoconut/src/scheme/mod.rs +++ b/common/nymcoconut/src/scheme/mod.rs @@ -3,9 +3,6 @@ // TODO: implement https://crates.io/crates/signature traits? - - - use bls12_381::{G1Projective, G2Prepared, G2Projective, Scalar}; use group::Curve; diff --git a/common/nymcoconut/src/scheme/verification.rs b/common/nymcoconut/src/scheme/verification.rs index ee389deb62..8e4aa2d508 100644 --- a/common/nymcoconut/src/scheme/verification.rs +++ b/common/nymcoconut/src/scheme/verification.rs @@ -13,8 +13,6 @@ use bls12_381::{multi_miller_loop, G1Affine, G2Prepared, G2Projective, Scalar}; use core::ops::Neg; use group::{Curve, Group}; - - pub use crate::scheme::double_use::BlindedSerialNumber; // TODO NAMING: this whole thing diff --git a/common/nymcoconut/src/traits.rs b/common/nymcoconut/src/traits.rs index bfeec703ec..b2aa13944c 100644 --- a/common/nymcoconut/src/traits.rs +++ b/common/nymcoconut/src/traits.rs @@ -8,7 +8,6 @@ use crate::CoconutError; use bls12_381::{G1Affine, G1Projective, Scalar}; use group::GroupEncoding; - pub trait Bytable where Self: Sized, diff --git a/common/nymcoconut/src/utils.rs b/common/nymcoconut/src/utils.rs index fe4a288087..819156cb23 100644 --- a/common/nymcoconut/src/utils.rs +++ b/common/nymcoconut/src/utils.rs @@ -4,7 +4,6 @@ use core::iter::Sum; use core::ops::Mul; - use bls12_381::hash_to_curve::{ExpandMsgXmd, HashToCurve, HashToField}; use bls12_381::{G1Affine, G1Projective, G2Affine, G2Projective, Scalar}; use ff::Field; diff --git a/common/nymsphinx/framing/src/codec.rs b/common/nymsphinx/framing/src/codec.rs index ef7b412fbc..2abc29f91e 100644 --- a/common/nymsphinx/framing/src/codec.rs +++ b/common/nymsphinx/framing/src/codec.rs @@ -241,7 +241,7 @@ mod packet_encoding { mod decode_will_allocate_enough_bytes_for_next_call { use super::*; use nym_sphinx_params::packet_version::PacketVersion; - + #[test] fn for_empty_bytes() { // empty bytes should allocate for header + ack packet diff --git a/common/nymsphinx/framing/src/packet.rs b/common/nymsphinx/framing/src/packet.rs index aaae18252e..7d6dfcfa01 100644 --- a/common/nymsphinx/framing/src/packet.rs +++ b/common/nymsphinx/framing/src/packet.rs @@ -8,7 +8,6 @@ use nym_sphinx_params::packet_version::PacketVersion; use nym_sphinx_params::PacketType; use nym_sphinx_types::NymPacket; - #[derive(Debug)] pub struct FramedNymPacket { /// Contains any metadata helping receiver to handle the underlying packet. diff --git a/common/socks5-client-core/src/socks/mod.rs b/common/socks5-client-core/src/socks/mod.rs index 4b6cc169f0..3ec1129c92 100644 --- a/common/socks5-client-core/src/socks/mod.rs +++ b/common/socks5-client-core/src/socks/mod.rs @@ -1,7 +1,5 @@ #![forbid(unsafe_code)] - - use self::types::SocksProxyError; pub mod authentication; diff --git a/common/topology/src/serde.rs b/common/topology/src/serde.rs index 78990d2f11..e5536e1b2e 100644 --- a/common/topology/src/serde.rs +++ b/common/topology/src/serde.rs @@ -17,7 +17,6 @@ use std::collections::BTreeMap; use std::net::{IpAddr, SocketAddr}; use thiserror::Error; - #[cfg(feature = "wasm-serde-types")] use tsify::Tsify; diff --git a/common/types/src/currency.rs b/common/types/src/currency.rs index 1e9cceb521..2e32b4288d 100644 --- a/common/types/src/currency.rs +++ b/common/types/src/currency.rs @@ -396,7 +396,7 @@ impl TryFrom for Coin { #[cfg(test)] mod test { use super::*; - + #[test] fn dec_value_scale_down() { let dec = DecCoin { diff --git a/contracts/mixnet/src/interval/pending_events.rs b/contracts/mixnet/src/interval/pending_events.rs index 6ba77faa6d..e0c5077a8f 100644 --- a/contracts/mixnet/src/interval/pending_events.rs +++ b/contracts/mixnet/src/interval/pending_events.rs @@ -1983,8 +1983,8 @@ mod tests { #[cfg(test)] mod changing_mix_cost_params { - use cosmwasm_std::coin; use crate::support::tests::fixtures::TEST_COIN_DENOM; + use cosmwasm_std::coin; use super::*; diff --git a/contracts/mixnet/src/mixnodes/transactions.rs b/contracts/mixnet/src/mixnodes/transactions.rs index 00b000a43e..032ef29bc9 100644 --- a/contracts/mixnet/src/mixnodes/transactions.rs +++ b/contracts/mixnet/src/mixnodes/transactions.rs @@ -500,9 +500,7 @@ pub mod tests { use cosmwasm_std::{Order, StdResult, Uint128}; use mixnet_contract_common::mixnode::PendingMixNodeChanges; - use mixnet_contract_common::{ - EpochState, EpochStatus, ExecuteMsg, LayerDistribution, Percent, - }; + use mixnet_contract_common::{EpochState, EpochStatus, ExecuteMsg, LayerDistribution, Percent}; use crate::contract::execute; use crate::mixnet_contract_settings::storage::minimum_mixnode_pledge; diff --git a/contracts/mixnet/src/rewards/queries.rs b/contracts/mixnet/src/rewards/queries.rs index 59f3799b56..87df0f9fc8 100644 --- a/contracts/mixnet/src/rewards/queries.rs +++ b/contracts/mixnet/src/rewards/queries.rs @@ -411,7 +411,6 @@ mod tests { use crate::support::tests::test_helpers::get_bank_send_msg; use cosmwasm_std::testing::mock_info; - #[test] fn for_non_existent_delegation() { let test = TestSetup::new(); diff --git a/mixnode/src/commands/sign.rs b/mixnode/src/commands/sign.rs index 8225649707..b178718fc1 100644 --- a/mixnode/src/commands/sign.rs +++ b/mixnode/src/commands/sign.rs @@ -11,7 +11,6 @@ use nym_crypto::asymmetric::identity; use nym_types::helpers::ConsoleSigningOutput; use nym_validator_client::nyxd; - use super::version_check; #[derive(Args, Clone)] diff --git a/nym-api/src/coconut/client.rs b/nym-api/src/coconut/client.rs index 3b65d83649..d009989996 100644 --- a/nym-api/src/coconut/client.rs +++ b/nym-api/src/coconut/client.rs @@ -73,7 +73,6 @@ pub trait Client { dealing_index: DealingIndex, ) -> Result; - async fn get_current_dealers(&self) -> Result>; #[allow(dead_code)] diff --git a/nym-api/src/coconut/dkg/dealing.rs b/nym-api/src/coconut/dkg/dealing.rs index 7cbd4fa80f..21b5803854 100644 --- a/nym-api/src/coconut/dkg/dealing.rs +++ b/nym-api/src/coconut/dkg/dealing.rs @@ -125,7 +125,8 @@ impl DkgController { // update the state with the dealing information self.state .dealing_exchange_state_mut(epoch_id)? - .generated_dealings.clone_from(&dealings); + .generated_dealings + .clone_from(&dealings); Ok(dealings) } diff --git a/nym-api/src/coconut/dkg/key_validation.rs b/nym-api/src/coconut/dkg/key_validation.rs index 4daa0da601..ada4f72898 100644 --- a/nym-api/src/coconut/dkg/key_validation.rs +++ b/nym-api/src/coconut/dkg/key_validation.rs @@ -234,7 +234,10 @@ impl DkgController { } let votes = self.generate_votes(epoch_id).await?; - self.state.key_validation_state_mut(epoch_id)?.votes.clone_from(&votes); + self.state + .key_validation_state_mut(epoch_id)? + .votes + .clone_from(&votes); // send the votes for (proposal, vote) in votes { diff --git a/nym-api/src/support/storage/manager.rs b/nym-api/src/support/storage/manager.rs index 953483d9c1..cf0ec15f79 100644 --- a/nym-api/src/support/storage/manager.rs +++ b/nym-api/src/support/storage/manager.rs @@ -8,7 +8,6 @@ use crate::support::storage::models::{ }; use nym_mixnet_contract_common::{EpochId, IdentityKey, MixId}; - #[derive(Clone)] pub(crate) struct StorageManager { pub(crate) connection_pool: sqlx::SqlitePool, diff --git a/nym-outfox/src/format.rs b/nym-outfox/src/format.rs index 86ac52305d..4a9261bd3f 100644 --- a/nym-outfox/src/format.rs +++ b/nym-outfox/src/format.rs @@ -63,8 +63,6 @@ use curve25519_dalek::constants::ED25519_BASEPOINT_TABLE; use curve25519_dalek::montgomery::MontgomeryPoint; use curve25519_dalek::scalar::Scalar; - - use std::ops::Range; use std::u8; @@ -79,7 +77,6 @@ use crate::constants::TAGBYTES; use crate::error::OutfoxError; use crate::lion::*; - /// A structure that holds mix packet construction parameters. These incluse the length /// of the routing information at each hop, the number of hops, and the payload length. #[derive(Eq, PartialEq, Debug)] @@ -318,7 +315,6 @@ impl MixStageParameters { mod test { use super::MixCreationParameters; - #[test] fn test_to_bytes() { let mix_params = MixCreationParameters::new(1024); diff --git a/nym-outfox/src/packet.rs b/nym-outfox/src/packet.rs index 48fbb6728c..0b0208703b 100644 --- a/nym-outfox/src/packet.rs +++ b/nym-outfox/src/packet.rs @@ -1,8 +1,4 @@ -use std::{ - array::TryFromSliceError, - collections::VecDeque, - ops::Range, -}; +use std::{array::TryFromSliceError, collections::VecDeque, ops::Range}; use crate::{ constants::{DEFAULT_HOPS, MAGIC_SLICE, MIN_PACKET_SIZE, MIX_PARAMS_LEN},