fix: more linting

kukkok3 · kukkok3 · commit 79a38d250c21 · 2024-02-21T11:33:31.000+01:00
diff --git a/src/catalyst-toolbox/catalyst-toolbox/src/rewards/proposers/mod.rs b/src/catalyst-toolbox/catalyst-toolbox/src/rewards/proposers/mod.rs
@@ -1,3 +1,4 @@
+#[allow(hidden_glob_reexports)]
 use self::{io::vecs_to_maps, types::NotFundedReason};
 use crate::types::{challenge::Challenge, proposal::Proposal};
 use chain_impl_mockchain::value::Value;
diff --git a/src/chain-libs/chain-impl-mockchain/src/testing/arbitrary/address.rs b/src/chain-libs/chain-impl-mockchain/src/testing/arbitrary/address.rs
@@ -106,20 +106,23 @@ impl ArbitraryAddressDataValueVec {
     pub fn utxos(&self) -> Vec<AddressDataValue> {
         self.0
             .iter()
-            .filter(|&x| matches!(x.address_data.kind(), Kind::Single { .. })).cloned()
+            .filter(|&x| matches!(x.address_data.kind(), Kind::Single { .. }))
+            .cloned()
             .collect()
     }
     pub fn accounts(&self) -> Vec<AddressDataValue> {
         self.0
             .iter()
-            .filter(|&x| matches!(x.address_data.kind(), Kind::Account { .. })).cloned()
+            .filter(|&x| matches!(x.address_data.kind(), Kind::Account { .. }))
+            .cloned()
             .collect()
     }
 
     pub fn delegations(&self) -> Vec<AddressDataValue> {
         self.0
             .iter()
             .filter(|&x| matches!(x.address_data.kind(), Kind::Group { .. }))
-            .cloned().collect()
+            .cloned()
+            .collect()
     }
 }
diff --git a/src/chain-libs/chain-impl-mockchain/src/testing/arbitrary/transaction.rs b/src/chain-libs/chain-impl-mockchain/src/testing/arbitrary/transaction.rs
@@ -190,7 +190,8 @@ impl AccountStatesVerifier {
             .0
             .addresses
             .iter()
-            .filter(|&x| filter_accounts(x)).cloned()
+            .filter(|&x| filter_accounts(x))
+            .cloned()
             .map(|x| find_equal_and_sub(x, inputs))
             .collect();
 
@@ -231,7 +232,8 @@ impl AccountStatesVerifier {
 fn find_equal_and_sub(x: AddressDataValue, collection: &[AddressDataValue]) -> AddressDataValue {
     match collection
         .iter()
-        .find(|&y| y.address_data == x.address_data).cloned()
+        .find(|&y| y.address_data == x.address_data)
+        .cloned()
     {
         Some(y) => AddressDataValue::new(x.address_data, (x.value - y.value).unwrap()),
         None => x,
@@ -241,7 +243,8 @@ fn find_equal_and_sub(x: AddressDataValue, collection: &[AddressDataValue]) -> A
 fn find_equal_and_add(x: AddressDataValue, collection: &[AddressDataValue]) -> AddressDataValue {
     match collection
         .iter()
-        .find(|&y| y.address_data == x.address_data).cloned()
+        .find(|&y| y.address_data == x.address_data)
+        .cloned()
     {
         Some(y) => AddressDataValue::new(x.address_data, (x.value + y.value).unwrap()),
         None => x,
@@ -265,20 +268,23 @@ impl UtxoVerifier {
     pub fn new(transaction_data: ArbitraryValidTransactionData) -> Self {
         UtxoVerifier(transaction_data)
     }
-
+    #[allow(clippy::iter_overeager_cloned)]
     pub fn calculate_current_utxo(&self) -> Vec<AddressDataValue> {
         let inputs = &self.0.input_addresses;
         let all = &self.0.addresses;
         let outputs = &self.0.output_addresses;
 
         let utxo_not_changed: Vec<AddressDataValue> = all
             .iter()
+            .filter(|&x| filter_utxo(x))
             .cloned()
-            .filter(filter_utxo)
             .filter(|x| !inputs.contains(x))
             .collect();
-        let utxo_added: Vec<AddressDataValue> =
-            outputs.iter().cloned().filter(filter_utxo).collect();
+        let utxo_added: Vec<AddressDataValue> = outputs
+            .iter()
+            .filter(|&x| filter_utxo(x))
+            .cloned()
+            .collect();
 
         let mut snapshot = Vec::new();
         snapshot.extend(utxo_not_changed);
diff --git a/src/chain-libs/chain-impl-mockchain/src/testing/arbitrary/utils.rs b/src/chain-libs/chain-impl-mockchain/src/testing/arbitrary/utils.rs
@@ -139,8 +139,8 @@ impl Verify {
     pub fn get_result(&self) -> TestResult {
         self.0
             .iter()
+            .find(|&x| TestResult::is_failure(x))
             .cloned()
-            .find(TestResult::is_failure)
             .unwrap_or_else(TestResult::passed)
     }
 }
diff --git a/src/chain-libs/chain-impl-mockchain/src/testing/builders/tx_builder.rs b/src/chain-libs/chain-impl-mockchain/src/testing/builders/tx_builder.rs
@@ -85,7 +85,7 @@ impl TestTxBuilder {
         );
         let mut faucet = test_ledger
             .faucets
-            .get(0)
+            .first()
             .cloned()
             .as_mut()
             .expect("test ledger with no faucet configured")
@@ -126,7 +126,7 @@ impl TestTxBuilder {
         );
         let mut faucet = test_ledger
             .faucets
-            .get(0)
+            .first()
             .as_mut()
             .expect("test ledger with no faucet configured")
             .clone();
diff --git a/src/chain-libs/chain-impl-mockchain/src/testing/gen/mod.rs b/src/chain-libs/chain-impl-mockchain/src/testing/gen/mod.rs
@@ -211,7 +211,7 @@ impl TestGen {
         rng.fill_bytes(&mut policy_hash);
 
         TokenIdentifier {
-            policy_hash: TryFrom::try_from(policy_hash).unwrap(),
+            policy_hash: From::from(policy_hash),
             token_name: Self::token_name(),
         }
     }
diff --git a/src/chain-libs/chain-impl-mockchain/src/testing/scenario/controller.rs b/src/chain-libs/chain-impl-mockchain/src/testing/scenario/controller.rs
@@ -71,8 +71,8 @@ impl Controller {
     pub fn wallet(&self, alias: &str) -> Result<Wallet, ControllerError> {
         self.declared_wallets
             .iter()
+            .find(|&x| x.alias() == alias)
             .cloned()
-            .find(|x| x.alias() == alias)
             .ok_or(ControllerError::UnknownWallet {
                 alias: alias.to_owned(),
             })
@@ -81,8 +81,8 @@ impl Controller {
     pub fn vote_plan(&self, alias: &str) -> Result<VotePlanDef, ControllerError> {
         self.declared_vote_plans
             .iter()
+            .find(|&x| x.alias() == alias)
             .cloned()
-            .find(|x| x.alias() == alias)
             .ok_or(ControllerError::UnknownVotePlan {
                 alias: alias.to_owned(),
             })
@@ -95,8 +95,8 @@ impl Controller {
     pub fn stake_pool(&self, alias: &str) -> Result<StakePool, ControllerError> {
         self.declared_stake_pools
             .iter()
+            .find(|&x| x.alias() == alias)
             .cloned()
-            .find(|x| x.alias() == alias)
             .ok_or(ControllerError::UnknownStakePool {
                 alias: alias.to_owned(),
             })
diff --git a/src/chain-libs/chain-impl-mockchain/src/testing/scenario/scenario_builder.rs b/src/chain-libs/chain-impl-mockchain/src/testing/scenario/scenario_builder.rs
@@ -113,8 +113,8 @@ impl ScenarioBuilder {
                 let vote_plan_def = x.build();
                 let owner = wallets
                     .iter()
+                    .find(|&w| w.alias() == vote_plan_def.owner())
                     .cloned()
-                    .find(|w| w.alias() == vote_plan_def.owner())
                     .expect("cannot find wallet for vote plan");
                 let vote_plan: VotePlan = vote_plan_def.into();
                 create_initial_vote_plan(&vote_plan, &[owner])
@@ -162,8 +162,8 @@ impl ScenarioBuilder {
                     .map(|pk| {
                         wallets
                             .iter()
+                            .find(|&x| x.public_key() == pk)
                             .cloned()
-                            .find(|x| x.public_key() == pk)
                             .expect("unknown key")
                     })
                     .collect();
@@ -180,8 +180,8 @@ impl ScenarioBuilder {
     ) -> Vec<Fragment> {
         initials
             .iter()
+            .filter(|&x| x.delegates_stake_pool().is_some())
             .cloned()
-            .filter(|x| x.delegates_stake_pool().is_some())
             .map(|wallet_template| {
                 let stake_pool_alias = wallet_template.delegates_stake_pool().unwrap();
                 let stake_pool = stake_pools
diff --git a/src/chain-libs/chain-impl-mockchain/src/value.rs b/src/chain-libs/chain-impl-mockchain/src/value.rs
@@ -21,7 +21,7 @@ pub struct SplitValueIn {
     pub parts: Value,
     pub remaining: Value,
 }
-
+#[allow(clippy::manual_try_fold)]
 impl Value {
     pub fn zero() -> Self {
         Value(0)
@@ -31,7 +31,7 @@ impl Value {
     where
         I: Iterator<Item = Self>,
     {
-        values.try_fold(Value::zero(), |acc, v| acc? + v)
+        values.fold(Ok(Value::zero()), |acc, v| acc? + v)
     }
 
     #[inline]
diff --git a/src/event-db/src/queries/event/mod.rs b/src/event-db/src/queries/event/mod.rs
@@ -1,3 +1,4 @@
+#![allow(deprecated)]
 use crate::{
     error::Error,
     types::event::{
diff --git a/src/event-db/src/queries/registration.rs b/src/event-db/src/queries/registration.rs
@@ -1,3 +1,4 @@
+#![allow(deprecated)]
 use crate::{
     types::{
         event::EventId,
diff --git a/src/event-db/src/queries/search.rs b/src/event-db/src/queries/search.rs
@@ -1,3 +1,4 @@
+#![allow(deprecated)]
 use crate::{
     types::{
         search::{
diff --git a/src/event-db/src/queries/vit_ss/fund.rs b/src/event-db/src/queries/vit_ss/fund.rs
@@ -1,3 +1,4 @@
+#![allow(deprecated)]
 use crate::{
     types::vit_ss::{
         challenge::{Challenge, ChallengeHighlights},
@@ -60,7 +61,7 @@ impl EventDB {
     next_fund.voting_start AS next_voting_start,
     next_fund.voting_end AS next_voting_end,
     next_fund.tallying_end AS next_tallying_end
-    
+
     FROM event this_fund
     LEFT JOIN event next_fund ON next_fund.row_id = this_fund.row_id + 1
     WHERE this_fund.end_time > CURRENT_TIMESTAMP AT TIME ZONE 'UTC' AND this_fund.start_time < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'
diff --git a/src/vit-testing/iapyx/src/load/config/mod.rs b/src/vit-testing/iapyx/src/load/config/mod.rs
@@ -5,7 +5,6 @@ mod servicing_station;
 pub use artificial_user::{
     Config as ArtificialUserLoadConfig, RequestType as ArtificialUserRequestType,
 };
-pub use node::{Config as NodeLoadConfig, Error as NodeLoadConfigError};
 pub use servicing_station::{
     Config as ServicingStationLoadConfig, Error as ServicingStationConfigError,
     RequestType as ServicingStationRequestType,
diff --git a/src/vit-testing/iapyx/src/load/mod.rs b/src/vit-testing/iapyx/src/load/mod.rs
@@ -4,7 +4,6 @@ mod request_generators;
 mod scenario;
 mod status_provider;
 
-pub use config::{ArtificialUserLoadConfig, NodeLoadConfig};
 pub use multi_controller::{MultiController, MultiControllerError};
 pub use request_generators::{ServicingStationRequestGen, WalletRequestGen};
 pub use scenario::*;
diff --git a/src/vit-testing/mainnet-lib/src/network/wallet_state/template/mod.rs b/src/vit-testing/mainnet-lib/src/network/wallet_state/template/mod.rs
@@ -104,7 +104,7 @@ pub enum Error {
 #[cfg(test)]
 mod tests {
     use crate::network::wallet_state::template::{
-        build_default, delegator, registration, representative,
+        actor::delegator, actor::registration, actor::representative, build_default,
     };
     use crate::{Block0, BlockBuilder, Ledger, Settings};
     use cardano_serialization_lib::Transaction;
diff --git a/src/vit-testing/mainnet-tools/src/cardano_cli/wrapper/mod.rs b/src/vit-testing/mainnet-tools/src/cardano_cli/wrapper/mod.rs
@@ -4,5 +4,5 @@ mod error;
 pub mod utils;
 
 pub use cli::Api;
-pub use data::CardanoKeyTemplate;
+
 pub use error::Error;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#[allow(hidden_glob_reexports)]`
`1`	`2`	`use self::{io::vecs_to_maps, types::NotFundedReason};`
`2`	`3`	`use crate::types::{challenge::Challenge, proposal::Proposal};`
`3`	`4`	`use chain_impl_mockchain::value::Value;`
Original file line number	Diff line number	Diff line change
`@@ -139,8 +139,8 @@ impl Verify {`
`139`	`139`	`pub fn get_result(&self) -> TestResult {`
`140`	`140`	`self.0`
`141`	`141`	`.iter()`
	`142`	`+ .find(\|&x\| TestResult::is_failure(x))`
`142`	`143`	`.cloned()`
`143`		`- .find(TestResult::is_failure)`
`144`	`144`	`.unwrap_or_else(TestResult::passed)`
`145`	`145`	`}`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ impl TestGen {`
`211`	`211`	`rng.fill_bytes(&mut policy_hash);`
`212`	`212`
`213`	`213`	`TokenIdentifier {`
`214`		`- policy_hash: TryFrom::try_from(policy_hash).unwrap(),`
	`214`	`+ policy_hash: From::from(policy_hash),`
`215`	`215`	`token_name: Self::token_name(),`
`216`	`216`	`}`
`217`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ pub struct SplitValueIn {`
`21`	`21`	`pub parts: Value,`
`22`	`22`	`pub remaining: Value,`
`23`	`23`	`}`
`24`		`-`
	`24`	`+#[allow(clippy::manual_try_fold)]`
`25`	`25`	`impl Value {`
`26`	`26`	`pub fn zero() -> Self {`
`27`	`27`	`Value(0)`
`@@ -31,7 +31,7 @@ impl Value {`
`31`	`31`	`where`
`32`	`32`	`I: Iterator<Item = Self>,`
`33`	`33`	`{`
`34`		`- values.try_fold(Value::zero(), \|acc, v\| acc? + v)`
	`34`	`+ values.fold(Ok(Value::zero()), \|acc, v\| acc? + v)`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`#[inline]`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#![allow(deprecated)]`
`1`	`2`	`use crate::{`
`2`	`3`	`error::Error,`
`3`	`4`	`types::event::{`