Skip to content

Various Clippy fixes #2781

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.

Sign up for GitHub

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

Merged
hrxi merged 1 commit into from
Aug 1, 2024
Merged

Various Clippy fixes #2781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ clippy.empty_docs = "allow" # false positives: https://github.com/rust-lang/rust
clippy.large_enum_variant = "allow"
clippy.too_many_arguments = "allow"
clippy.type_complexity = "allow"
rust.unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] }
rust.unused_qualifications = "warn"

[workspace.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion bls/src/types/compressed_signature.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ impl fmt::Display for CompressedSignature {
impl From<G1Projective> for CompressedSignature {
fn from(signature: G1Projective) -> Self {
let mut buffer = [0u8; SIZE];
CanonicalSerialize::serialize_compressed(&signature.into_affine(), &mut &mut buffer[..])
CanonicalSerialize::serialize_compressed(&signature.into_affine(), &mut buffer[..])
Copy link
Contributor

@hrxi hrxi Jul 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What warning does this fix?

Copy link
Member Author

@Eligioo Eligioo Jul 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

warning: the borrowed expression implements the required traits
  --> bls/src/types/compressed_signature.rs:96:76
   |
96 |         CanonicalSerialize::serialize_compressed(&signature.into_affine(), &mut &mut buffer[..])
   |                                                                            ^^^^^^^^^^^^^^^^^^^^ help: change this to: `&mut buffer[..]`
   |
   = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#needless_borrows_for_generic_args
   = note: `#[warn(clippy::needless_borrows_for_generic_args)]` on by default

.unwrap();
CompressedSignature { signature: buffer }
}
Expand Down
7 changes: 2 additions & 5 deletions bls/src/types/public_key.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,8 @@ impl PublicKey {
/// and one bit indicating if it is the "point-at-infinity".
pub fn compress(&self) -> CompressedPublicKey {
let mut buffer = [0u8; CompressedPublicKey::SIZE];
CanonicalSerialize::serialize_compressed(
&self.public_key.into_affine(),
&mut &mut buffer[..],
)
.unwrap();
CanonicalSerialize::serialize_compressed(&self.public_key.into_affine(), &mut buffer[..])
.unwrap();
CompressedPublicKey { public_key: buffer }
}

Expand Down
1 change: 1 addition & 0 deletions consensus/src/consensus/remote_data_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ use crate::messages::RequestTrieProof;
/// - Validators
/// - Stakers
/// - Tombstones
///
/// It also serves as an utility function to extract any type from the Accounts Trie
/// remotely.
pub(crate) struct RemoteDataStore<N: Network> {
Expand Down
1 change: 1 addition & 0 deletions consensus/src/sync/light/sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ const PENDING_SIZE: usize = 5;
/// 1. Request the latest ZKP from a peer
/// 2. Request epoch IDs from the peer
/// 3. Request the last (if any) election or checkpoint blocks
///
/// If during the process, a peer is deemed as outdated, then it is emitted
pub struct LightMacroSync<TNetwork: Network> {
/// The blockchain
Expand Down
1 change: 1 addition & 0 deletions consensus/src/sync/syncer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ pub enum LiveSyncPeerEvent<TPeerId> {
/// - Macro sync: Synchronizes up to the last macro block
/// - Live Sync: Synchronizes the blockchain to the blocks being processed/announced
/// by the peers.
///
/// These two dynamic trait objects are necessary to implement the different types of
/// synchronization such as: history sync, full sync and light sync.
/// The Syncer handles the interactions between these trait objects, the blockchain and
Expand Down
1 change: 0 additions & 1 deletion lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ console-subscriber = { version = "0.4", features = [
derive_builder = "0.20"
directories = "5.0"
hex = "0.4"
# human-panic = { version = "1.0", optional = true } currently unused, might be used in the future
log = { workspace = true }
log-panics = { version = "2.1", features = ["with-backtrace"], optional = true }
parking_lot = "0.12"
Expand Down
1 change: 1 addition & 0 deletions network-libp2p/src/discovery/handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ impl Handler {
/// Checks if the handler is ready to start the discovery protocol.
/// This basically checks that:
/// - Both inbound and outbound are available
///
/// If these conditions are met, it transitions to sending a handshake and waking
/// the waker.
fn check_initialized(&mut self) {
Expand Down
1 change: 1 addition & 0 deletions network-libp2p/src/dispatch/codecs/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use libp2p::{request_response, StreamProtocol};
use nimiq_network_interface::network;

/// Size of a u64
#[allow(unused_qualifications)] // Remove with a MSVR >= 1.80
const U64_LENGTH: usize = mem::size_of::<u64>();
const MAX_REQUEST_SIZE: u64 = network::MIN_SUPPORTED_REQ_SIZE as u64 + U64_LENGTH as u64;
const MAX_RESPONSE_SIZE: u64 = network::MIN_SUPPORTED_RESP_SIZE as u64 + U64_LENGTH as u64;
Expand Down
2 changes: 1 addition & 1 deletion pow-migration/tests/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//! setup code.
#[cfg(feature = "pow-migration-tests")]
mod pow_migration_test {
use nimiq_database::mdbx::{DatabaseConfig, MdbxDatabase};
use nimiq_database::mdbx::MdbxDatabase;
use nimiq_genesis_builder::config::GenesisConfig;
use nimiq_keys::Address;
use nimiq_pow_migration::{migrate, BlockWindows, Error};
Expand Down
2 changes: 1 addition & 1 deletion primitives/src/slots_allocation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ impl Hash for Validators {
let bytes: Vec<u8> = iter
.flat_map(|pk| {
let mut buffer = [0u8; 285];
CanonicalSerialize::serialize_compressed(&pk.into_affine(), &mut &mut buffer[..])
CanonicalSerialize::serialize_compressed(&pk.into_affine(), &mut buffer[..])
.unwrap();
buffer.to_vec()
})
Expand Down
9 changes: 5 additions & 4 deletions primitives/transaction/src/account/staking_contract/structs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ use nimiq_serde::{Deserialize, DeserializeError, Serialize, SerializedMaxSize};
use crate::{SignatureProof, Transaction, TransactionError};

/// We need to distinguish two types of transactions:
/// 1. Incoming transactions, which include:
/// 1. Incoming transactions. The type of transaction, parameters and proof are given in the `data` field of this transaction.
/// Supported incoming transactions are:
/// - Validator
/// * Create
/// * Update
Expand All @@ -18,13 +19,13 @@ use crate::{SignatureProof, Transaction, TransactionError};
/// * Create
/// * Update
/// * AddStake
/// The type of transaction, parameters and proof are given in the data field of the transaction.
/// 2. Outgoing transactions, which include:
///
/// 2. Outgoing transactions. The type of transaction, parameters and proof are given in the `proof` field of this transaction.
/// Supported outgoing transactions are:
/// - Validator
/// * Delete
/// - Staker
/// * RemoveStake
/// The type of transaction, parameters and proof are given in the proof field of the transaction.
///
/// It is important to note that all `signature` fields contain the signature
/// over the complete transaction with the `signature` field set to `Default::default()`.
Expand Down
36 changes: 18 additions & 18 deletions primitives/trie/src/trie.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,7 +1656,7 @@ mod tests {
let key_3 = "413b397fa".parse().unwrap();
let key_4 = "cfb986f5a".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let trie = MerkleRadixTrie::new(&env, TestTrie);
let mut raw_txn = env.write_transaction();
let mut txn: WriteTransactionProxy = (&mut raw_txn).into();
Expand Down Expand Up @@ -1720,7 +1720,7 @@ mod tests {
let key_3 = "cfb98e0f6".parse().unwrap();
let key_4 = "cfb98e0f5".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let trie = MerkleRadixTrie::new(&env, TestTrie);
let mut raw_txn = env.write_transaction();
let mut txn: WriteTransactionProxy = (&mut raw_txn).into();
Expand Down Expand Up @@ -1780,7 +1780,7 @@ mod tests {
let key_6 = "ca".parse().unwrap();
let key_7 = "b".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let trie = MerkleRadixTrie::new(&env, TestTrie);
let mut raw_txn = env.write_transaction();
let mut txn: WriteTransactionProxy = (&mut raw_txn).into();
Expand Down Expand Up @@ -1883,7 +1883,7 @@ mod tests {
let key_4 = "413b391".parse().unwrap();
let key_5 = "412324".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let trie = MerkleRadixTrie::new(&env, TestTrie);
let mut raw_txn = env.write_transaction();
let mut txn: WriteTransactionProxy = (&mut raw_txn).into();
Expand Down Expand Up @@ -1953,7 +1953,7 @@ mod tests {
let key_4 = "413b391".parse().unwrap();
let key_5 = "412324".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let trie = MerkleRadixTrie::new(&env, TestTrie);

let mut raw_txn = env.write_transaction();
Expand Down Expand Up @@ -2060,7 +2060,7 @@ mod tests {
let key_6 = "413f227fb".parse().unwrap();
let key_7 = "413f227fa0".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let trie = MerkleRadixTrie::new(&env, TestTrie);
let mut raw_txn = env.write_transaction();
let mut txn: WriteTransactionProxy = (&mut raw_txn).into();
Expand Down Expand Up @@ -2097,7 +2097,7 @@ mod tests {
.put_child(&proof_value_2.key, proof_value_2.hash_assert())
.unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let trie = MerkleRadixTrie::new_incomplete(&env, TestTrie);
let mut raw_txn = env.write_transaction();
let mut txn: WriteTransactionProxy = (&mut raw_txn).into();
Expand Down Expand Up @@ -2174,7 +2174,7 @@ mod tests {
let key_4 = "413b391".parse().unwrap();
let key_5: KeyNibbles = "412324".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let original = MerkleRadixTrie::new(&env, TestTrie);
let mut raw_txn = env.write_transaction();
let mut txn: WriteTransactionProxy = (&mut raw_txn).into();
Expand All @@ -2199,7 +2199,7 @@ mod tests {

#[test]
fn complete_tree_does_not_accept_chunks() {
let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let original = MerkleRadixTrie::new(&env, TestTrie);
let trie = MerkleRadixTrie::new(&env, TestTrieCopy);
let mut raw_txn = env.write_transaction();
Expand All @@ -2222,7 +2222,7 @@ mod tests {
let key_4 = "413b391".parse().unwrap();
let key_5 = "412324".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let original = MerkleRadixTrie::new(&env, TestTrie);
let trie = MerkleRadixTrie::new_incomplete(&env, TestTrieCopy);
let mut raw_txn = env.write_transaction();
Expand Down Expand Up @@ -2290,7 +2290,7 @@ mod tests {
let key_4 = "413b391".parse().unwrap();
let key_5 = "412324".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();

let original = MerkleRadixTrie::new(&env, TestTrie);
let copy = MerkleRadixTrie::new_incomplete(&env, TestTrieCopy);
Expand Down Expand Up @@ -2342,7 +2342,7 @@ mod tests {
let key_4 = "1c".parse().unwrap();
let key_5 = "81".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let original = MerkleRadixTrie::new(&env, TestTrie);
let copy = MerkleRadixTrie::new_incomplete(&env, TestTrieCopy);
let mut raw_txn = env.write_transaction();
Expand Down Expand Up @@ -2394,7 +2394,7 @@ mod tests {
let key_4 = "413b391".parse().unwrap();
let key_5 = "412324".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let original = MerkleRadixTrie::new(&env, TestTrie);

let init_trie = |env: &MdbxDatabase| -> MerkleRadixTrie<TestTrieCopy> {
Expand Down Expand Up @@ -2485,7 +2485,7 @@ mod tests {
let key_3 = "413f227fa".parse().unwrap();
let key_4 = "413b391".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let original = MerkleRadixTrie::new(&env, TestTrie);

let mut raw_txn = env.write_transaction();
Expand Down Expand Up @@ -2529,7 +2529,7 @@ mod tests {
let key_3 = "413f227fa".parse().unwrap();
let key_4 = "413b391".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let original = MerkleRadixTrie::new(&env, TestTrie);

let mut raw_txn = env.write_transaction();
Expand Down Expand Up @@ -2564,7 +2564,7 @@ mod tests {
fn remove_chunk_on_empty_tree() {
let key_1 = "413f22".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let original = MerkleRadixTrie::new(&env, TestTrie);

let mut raw_txn = env.write_transaction();
Expand All @@ -2582,7 +2582,7 @@ mod tests {
let key_4 = "413b391".parse().unwrap();
let key_5: KeyNibbles = "415324".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let original = MerkleRadixTrie::new(&env, TestTrie);

let mut raw_txn = env.write_transaction();
Expand Down Expand Up @@ -2618,7 +2618,7 @@ mod tests {
let key_3 = "413f227fa".parse().unwrap();
let key_4 = "413b391".parse().unwrap();

let env = nimiq_database::mdbx::MdbxDatabase::new_volatile(Default::default()).unwrap();
let env = MdbxDatabase::new_volatile(Default::default()).unwrap();
let original = MerkleRadixTrie::new(&env, TestTrie);

let mut raw_txn = env.write_transaction();
Expand Down
1 change: 1 addition & 0 deletions serde/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ impl<T: SerializedSize> SerializedMaxSize for T {
}

#[rustfmt::skip]
#[allow(unused_qualifications)] // Remove with a MSVR >= 1.80
mod integer_impls {
use super::SerializedFixedSize;
use super::SerializedMaxSize;
Expand Down
6 changes: 3 additions & 3 deletions tendermint/src/tendermint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ impl<TProtocol: Protocol> Tendermint<TProtocol> {
///
/// Failing to verify:
/// * As failing to verify could indicate a malicious validator we might want to introduce punishment here. One
/// option to do so is, similar to how we return proposals on the stream, to introduce another `Return` enum variant for that.
/// option to do so is, similar to how we return proposals on the stream, to introduce another `Return` enum variant for that.
/// * Potentially make a difference between incorrect signatures and incorrect proposals when it comes to punishment.
fn process_proposal(
&mut self,
Expand Down Expand Up @@ -407,9 +407,9 @@ impl<TProtocol: Protocol> Tendermint<TProtocol> {
///
/// Returns
/// * `None` if all messages were successfully dispatched while `level_update_stream` was polled
/// until it returned Poll::Pending.
/// until it returned Poll::Pending.
/// * `Some(tagged_message)` if any message exists for which the sender reports a full channel.
/// In this case the stream was not polled until it returned Pending.
/// In this case the stream was not polled until it returned Pending.
fn dispatch_messages(
&mut self,
cx: &mut Context<'_>,
Expand Down
2 changes: 1 addition & 1 deletion validator/src/proposal_buffer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ where
/// Checks one buffered proposal after another until a proposal which can be returned is found. Proposals which cannot be returned are either
/// * invalid and thus rejected/ignored
/// * have an unresolved predecessor and can thus not be verified. These proposals get removed from the buffer and a future to
/// resolve their predecessor is created.
/// resolve their predecessor is created.
pub fn poll_proposal(
&mut self,
blockchain_arc: Arc<RwLock<Blockchain>>,
Expand Down
2 changes: 1 addition & 1 deletion zkp-primitives/pedersen-generators/src/rand_gen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//! This file serves two functions:
//! 1) Hosting a tool that can be used to create a 256 bit random seed.
//! 2) Documenting in a public way the process so that it can be verified that, in fact,
//! the seed is random
//! the seed is random.
//!
//! ## Method
//! The initial random bytes are going to be the concatenated hashes of 15 Bitcoin block headers
Expand Down
4 changes: 2 additions & 2 deletions zkp-primitives/src/pedersen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ impl DefaultPedersenParameters95 for MNT4_753 {

fn g1_to_bytes(g1: &Self::G1) -> [u8; 95] {
let mut buffer = [0u8; 95];
CanonicalSerialize::serialize_compressed(&g1.into_affine(), &mut &mut buffer[..]).unwrap();
CanonicalSerialize::serialize_compressed(&g1.into_affine(), &mut buffer[..]).unwrap();
buffer
}
}
Expand All @@ -44,7 +44,7 @@ impl DefaultPedersenParameters95 for MNT6_753 {

fn g1_to_bytes(g1: &Self::G1) -> [u8; 95] {
let mut buffer = [0u8; 95];
CanonicalSerialize::serialize_compressed(&g1.into_affine(), &mut &mut buffer[..]).unwrap();
CanonicalSerialize::serialize_compressed(&g1.into_affine(), &mut buffer[..]).unwrap();
buffer
}
}
Expand Down
8 changes: 4 additions & 4 deletions zkp-primitives/src/serialize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@ use ark_serialize::CanonicalSerialize;
/// Serializes a G1 point in the MNT4-753 curve.
pub fn serialize_g1_mnt4(point: &MNT4G1Projective) -> [u8; 95] {
let mut buffer = [0u8; 95];
CanonicalSerialize::serialize_compressed(&point.into_affine(), &mut &mut buffer[..]).unwrap();
CanonicalSerialize::serialize_compressed(&point.into_affine(), &mut buffer[..]).unwrap();
buffer
}

/// Serializes a G2 point in the MNT4-753 curve.
pub fn serialize_g2_mnt4(point: &MNT4G2Projective) -> [u8; 190] {
let mut buffer = [0u8; 190];
CanonicalSerialize::serialize_compressed(&point.into_affine(), &mut &mut buffer[..]).unwrap();
CanonicalSerialize::serialize_compressed(&point.into_affine(), &mut buffer[..]).unwrap();
buffer
}

/// Serializes a G1 point in the MNT6-753 curve.
pub fn serialize_g1_mnt6(point: &MNT6G1Projective) -> [u8; 95] {
let mut buffer = [0u8; 95];
CanonicalSerialize::serialize_compressed(&point.into_affine(), &mut &mut buffer[..]).unwrap();
CanonicalSerialize::serialize_compressed(&point.into_affine(), &mut buffer[..]).unwrap();
buffer
}

/// Serializes a G2 point in the MNT6-753 curve.
pub fn serialize_g2_mnt6(point: &MNT6G2Projective) -> [u8; 285] {
let mut buffer = [0u8; 285];
CanonicalSerialize::serialize_compressed(&point.into_affine(), &mut &mut buffer[..]).unwrap();
CanonicalSerialize::serialize_compressed(&point.into_affine(), &mut buffer[..]).unwrap();
buffer
}