chore: clippy

Cargo.toml

@@ -52,7 +52,7 @@ members = [
     "precompiles/vesting",
     "precompiles/staking",
     "precompiles/rewards",
-    # "tangle-subxt",
+    # "tangle-subxt",  # TODO: regenerate for stable2503
     "evm-tracer",
 ]
 resolver = "2"
@@ -110,7 +110,7 @@ honggfuzz = { version = "0.5.55" }
 
 tangle-testnet-runtime = { package = "tangle-testnet-runtime", path = "runtime/testnet" }
 tangle-runtime = { package = "tangle-runtime", path = "runtime/mainnet" }
-# tangle-subxt = { package = "tangle-subxt", path = "tangle-subxt" }
+# tangle-subxt = { package = "tangle-subxt", path = "tangle-subxt" }  # TODO: regenerate for stable2503
 
 # Arkworks
 ark-ec = { version = "^0.4.2", default-features = false }

client/rpc/txpool/src/lib.rs

@@ -19,7 +19,6 @@ use ethereum_types::{H160, H256, U256};
 use fc_rpc::{internal_err, public_key};
 use jsonrpsee::core::RpcResult;
 pub use rpc_core_txpool::{GetT, Summary, Transaction, TransactionMap, TxPoolResult, TxPoolServer};
-use sc_transaction_pool::ChainApi;
 use sc_transaction_pool_api::{InPoolTransaction, TransactionPool as _};
 use serde::Serialize;
 use sha3::{Digest, Keccak256};

frost/src/keys.rs

@@ -471,10 +471,10 @@ pub fn split<C: Ciphersuite, R: RngCore + CryptoRng>(
 ) -> Result<(BTreeMap<Identifier<C>, SecretShare<C>>, PublicKeyPackage<C>), Error<C>> {
 	validate_num_of_signers(min_signers, max_signers)?;
 
-	if let IdentifierList::Custom(identifiers) = &identifiers {
-		if identifiers.len() != max_signers as usize {
-			return Err(Error::IncorrectNumberOfIdentifiers);
-		}
+	if let IdentifierList::Custom(identifiers) = &identifiers &&
+		identifiers.len() != max_signers as usize
+	{
+		return Err(Error::IncorrectNumberOfIdentifiers);
 	}
 
 	let verifying_key = VerifyingKey::from(key);

node/Cargo.toml

@@ -127,9 +127,9 @@ futures-timer = { workspace = true }
 # blueprint-keystore = { workspace = true, optional = true }
 
 [dev-dependencies]
-# tangle-subxt = { workspace = true }
+# tangle-subxt = { workspace = true }  # TODO: regenerate for stable2503
 sp-tracing = { workspace = true }
-alloy = { version = "0.9", features = ["full", "provider-debug-api"] }
+alloy = { version = "0.7", features = ["full", "provider-debug-api"] }
 anyhow = "1.0"
 
 [features]

node/src/manual_seal.rs

@@ -494,9 +494,9 @@ pub async fn new_full<Network: sc_network::NetworkBackend<Block, <Block as Block
 
 		let backend_clone = backend.clone();
 		Box::new(
-			move |spawner: Arc<dyn sc_core::traits::SpawnNamed>| -> Result<RpcModule<()>, sc_service::Error> {
+			move |spawner: Arc<dyn sp_core::traits::SpawnNamed>| -> Result<RpcModule<()>, sc_service::Error> {
 				let deny_unsafe = sc_rpc_api::DenyUnsafe::No;
-				let subscription_task_executor = sc_rpc::SubscriptionTaskExecutor(spawner);
+				let subscription_task_executor = spawner.clone();
 
 				let deps = crate::rpc::FullDeps {
 					client: client.clone(),
@@ -636,7 +636,7 @@ pub async fn new_full<Network: sc_network::NetworkBackend<Block, <Block as Block
 			.spawn_essential_handle()
 			.spawn_blocking("manual-seal", None, manual_seal);
 
-	log::info!("Manual Seal Ready");
+		log::info!("Manual Seal Ready");
 
 		#[cfg(feature = "blueprint-manager")]
 		{

node/src/rpc/eth.rs

@@ -43,6 +43,7 @@ use rpc_txpool::TxPoolServer;
 use sp_consensus_babe::BabeApi;
 
 #[derive(Clone)]
+#[allow(dead_code)]
 pub struct TracingConfig {
 	pub tracing_requesters: crate::rpc::tracing::RpcRequesters,
 	pub trace_filter_max_count: u32,
@@ -120,6 +121,7 @@ impl<C, P, CT: Clone, B: BlockT, CIDP: Clone> Clone for EthDeps<C, P, CT, B, CID
 }
 
 /// Instantiate Ethereum-compatible RPC extensions.
+#[allow(dead_code, clippy::extra_unused_type_parameters)]
 pub fn create_eth<B, C, BE, P, CT, CIDP, EC>(
 	mut io: RpcModule<()>,
 	deps: EthDeps<C, P, CT, B, CIDP>,

node/src/rpc/mod.rs

@@ -94,6 +94,7 @@ pub struct FullDeps<C, P, CT, SC, B, CIDP> {
 	pub backend: Arc<B>,
 }
 
+#[allow(dead_code)]
 pub struct DefaultEthConfig<C, BE>(std::marker::PhantomData<(C, BE)>);
 
 impl<C, BE> fc_rpc::EthConfig<Block, C> for DefaultEthConfig<C, BE>

node/src/rpc/tracing.rs

@@ -32,6 +32,7 @@ use substrate_prometheus_endpoint::Registry as PrometheusRegistry;
 use tokio::sync::Semaphore;
 
 #[derive(Clone)]
+#[allow(dead_code)]
 pub struct RpcRequesters {
 	pub debug: Option<DebugRequester>,
 	pub trace: Option<TraceFilterCacheRequester>,

node/src/service.rs

@@ -15,8 +15,8 @@
 
 //! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
 use crate::eth::{
-	BackendType, EthApi, FrontierBackend, FrontierBlockImport, FrontierPartialComponents,
-	RpcConfig, StorageOverride, StorageOverrideHandler, new_frontier_partial, spawn_frontier_tasks,
+	BackendType, FrontierBackend, FrontierBlockImport, FrontierPartialComponents, RpcConfig,
+	StorageOverride, StorageOverrideHandler, new_frontier_partial, spawn_frontier_tasks,
 };
 pub use crate::eth::{EthConfiguration, db_config_dir};
 use futures::FutureExt;
@@ -242,7 +242,7 @@ pub struct RunFullParams {
 /// Builds a new service for a full client.
 pub async fn new_full<Network: sc_network::NetworkBackend<Block, <Block as BlockT>::Hash>>(
 	RunFullParams {
-		mut config,
+		config,
 		eth_config,
 		rpc_config,
 		debug_output: _,
@@ -369,7 +369,7 @@ pub async fn new_full<Network: sc_network::NetworkBackend<Block, <Block as Block
 			metrics,
 		})?;
 
-	let role = config.role.clone();
+	let role = config.role;
 	let force_authoring = config.force_authoring;
 	let name = config.network.node_name.clone();
 	let enable_grandpa = !config.disable_grandpa;
@@ -500,9 +500,9 @@ pub async fn new_full<Network: sc_network::NetworkBackend<Block, <Block as Block
 
 		let backend_clone = backend.clone();
 		Box::new(
-			move |spawner: Arc<dyn sc_core::traits::SpawnNamed>| -> Result<RpcModule<()>, sc_service::Error> {
+			move |spawner: Arc<dyn sp_core::traits::SpawnNamed>| -> Result<RpcModule<()>, sc_service::Error> {
 				let deny_unsafe = sc_rpc_api::DenyUnsafe::No;
-				let subscription_task_executor = sc_rpc::SubscriptionTaskExecutor(spawner);
+				let subscription_task_executor = spawner.clone();
 
 				let deps = crate::rpc::FullDeps {
 					client: client.clone(),

node/tests/common/mod.rs

@@ -256,16 +256,16 @@ where
 			let config =
 				command.create_configuration(this, tokio_runtime.handle().clone()).unwrap();
 
-			// Handle logger initialization gracefully - it may already be initialized by previous
-			// tests
-			if let Err(e) = command.init(
-				&CliWrapper::support_url(),
-				&CliWrapper::impl_version(),
-				|_, _| {},
-				&config,
-			) {
-				warn!("Logger initialization failed (likely already initialized): {e:?}");
-			}
+		// Handle logger initialization gracefully - it may already be initialized by previous
+		// tests
+		if let Err(e) = command.init(
+			&CliWrapper::support_url(),
+			&CliWrapper::impl_version(),
+			|_| {},
+			&config,
+		) {
+			warn!("Logger initialization failed (likely already initialized): {e:?}");
+		}
 			sc_cli::Runner::<CliWrapper>::new(config, tokio_runtime, signals)
 		}
 	}

pallets/multi-asset-delegation/src/extra.rs

@@ -3,7 +3,7 @@ use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{DispatchInfoOf, TransactionExtension},
-	transaction_validity::{InvalidTransaction, TransactionValidityError, ValidTransaction},
+	transaction_validity::{TransactionValidityError, ValidTransaction},
 };
 use types::BalanceOf;
 

pallets/multi-asset-delegation/src/functions/evm.rs

@@ -272,10 +272,10 @@ impl<T: Config> Pallet<T> {
 			info.used_gas.standard.unique_saturated_into(),
 			true,
 		);
-		if let Some(weight_info) = info.weight_info {
-			if let Some(proof_size_usage) = weight_info.proof_size_usage {
-				*gas_to_weight.proof_size_mut() = proof_size_usage;
-			}
+		if let Some(weight_info) = info.weight_info &&
+			let Some(proof_size_usage) = weight_info.proof_size_usage
+		{
+			*gas_to_weight.proof_size_mut() = proof_size_usage;
 		}
 		gas_to_weight
 	}

pallets/rewards/src/functions/rewards.rs

@@ -345,43 +345,42 @@ impl<T: Config> Pallet<T> {
 
 		// Add score with lock multipliers if any
 		// only if the admin has enabled boost multiplier for the vault
-		if reward.boost_multiplier.is_some() {
-			if let Some(locks) = deposit.amount_with_locks {
-				for lock in locks {
-					if lock.expiry_block > last_claim_block {
-						if lock.expiry_block > current_block {
-							// Calculate lock reward:
-							// amount * APY * lock_multiplier *
-							//    (remaining_lock_time / total_lock_time)
-							let multiplier = BalanceOf::<T>::from(lock.lock_multiplier.value());
-							let lock_score = lock.amount.saturating_mul(multiplier);
-							log::debug!(target: LOG_TARGET, "user lock has not expired and still active, lock_multiplier: {:?}, lock_score: {:?}", lock.lock_multiplier, lock_score);
-
-							user_rewards_score_by_blocks.push((lock_score, blocks_to_be_paid));
-						} else {
-							// the lock has expired, so we only apply the lock multiplier during the
-							// unexpired period
-							let multiplier = BalanceOf::<T>::from(lock.lock_multiplier.value());
-							let lock_score = lock.amount.saturating_mul(multiplier);
-							let multiplier_applied_blocks =
-								lock.expiry_block.saturating_sub(last_claim_block);
-
-							log::debug!(target: LOG_TARGET, "user lock has partially expired, lock_multiplier: {:?}, lock_score: {:?}, multiplier_applied_blocks: {:?}, blocks_to_be_paid: {:?}",
+		if reward.boost_multiplier.is_some() &&
+			let Some(locks) = deposit.amount_with_locks
+		{
+			for lock in locks {
+				if lock.expiry_block > last_claim_block {
+					if lock.expiry_block > current_block {
+						// Calculate lock reward:
+						// amount * APY * lock_multiplier *
+						//    (remaining_lock_time / total_lock_time)
+						let multiplier = BalanceOf::<T>::from(lock.lock_multiplier.value());
+						let lock_score = lock.amount.saturating_mul(multiplier);
+						log::debug!(target: LOG_TARGET, "user lock has not expired and still active, lock_multiplier: {:?}, lock_score: {:?}", lock.lock_multiplier, lock_score);
+
+						user_rewards_score_by_blocks.push((lock_score, blocks_to_be_paid));
+					} else {
+						// the lock has expired, so we only apply the lock multiplier during the
+						// unexpired period
+						let multiplier = BalanceOf::<T>::from(lock.lock_multiplier.value());
+						let lock_score = lock.amount.saturating_mul(multiplier);
+						let multiplier_applied_blocks =
+							lock.expiry_block.saturating_sub(last_claim_block);
+
+						log::debug!(target: LOG_TARGET, "user lock has partially expired, lock_multiplier: {:?}, lock_score: {:?}, multiplier_applied_blocks: {:?}, blocks_to_be_paid: {:?}",
 								lock.lock_multiplier, lock_score, multiplier_applied_blocks, blocks_to_be_paid);
 
-							user_rewards_score_by_blocks
-								.push((lock_score, multiplier_applied_blocks));
+						user_rewards_score_by_blocks.push((lock_score, multiplier_applied_blocks));
 
-							// for rest of the blocks, we do not apply the lock multiplier
-							user_rewards_score_by_blocks.push((
-								lock.amount,
-								blocks_to_be_paid.saturating_sub(multiplier_applied_blocks),
-							));
-						}
-					} else {
-						// if the lock has expired, we only consider the base score
-						user_rewards_score_by_blocks.push((lock.amount, blocks_to_be_paid));
+						// for rest of the blocks, we do not apply the lock multiplier
+						user_rewards_score_by_blocks.push((
+							lock.amount,
+							blocks_to_be_paid.saturating_sub(multiplier_applied_blocks),
+						));
 					}
+				} else {
+					// if the lock has expired, we only consider the base score
+					user_rewards_score_by_blocks.push((lock.amount, blocks_to_be_paid));
 				}
 			}
 		}

pallets/services/src/functions/evm_hooks.rs

@@ -1920,10 +1920,10 @@ impl<T: Config> Pallet<T> {
 			info.used_gas.standard.unique_saturated_into(),
 			true,
 		);
-		if let Some(weight_info) = info.weight_info {
-			if let Some(proof_size_usage) = weight_info.proof_size_usage {
-				*gas_to_weight.proof_size_mut() = proof_size_usage;
-			}
+		if let Some(weight_info) = info.weight_info &&
+			let Some(proof_size_usage) = weight_info.proof_size_usage
+		{
+			*gas_to_weight.proof_size_mut() = proof_size_usage;
 		}
 		gas_to_weight
 	}