* Clippy corrections

pallets/ajuna-awesome-avatars/src/lib.rs

@@ -52,7 +52,6 @@
 //! * `do_mint` - Mint avatar.
 //! * `ensure_season` - Given a season id and a season, validate them.
 
-#![feature(variant_count)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
 extern crate core;

pallets/ajuna-awesome-avatars/src/tests.rs

@@ -2983,7 +2983,7 @@ mod account {
 	#[test]
 	fn upgrade_storage_should_work() {
 		let upgrade_fee = 12_345 as MockBalance;
-		let num_storage_tiers = sp_std::mem::variant_count::<StorageTier>();
+		let num_storage_tiers = 6;
 		let alice_balance = num_storage_tiers as MockBalance * upgrade_fee;
 		let mut treasury_balance = 0;
 		let total_supply = treasury_balance + alice_balance;

pallets/ajuna-awesome-avatars/src/types/avatar/versions/v2/combinator/glimmer.rs

@@ -7,8 +7,8 @@ impl<T: Config> AvatarCombinator<T> {
 		season_id: SeasonId,
 		hash_provider: &mut HashProvider<T, 32>,
 	) -> Result<(LeaderForgeOutput<T>, Vec<ForgeOutput<T>>), DispatchError> {
-		let color_types = variant_count::<ColorType>() as u8;
-		let forces = variant_count::<Force>() as u8;
+		let color_types = 5;
+		let forces = 7;
 
 		let (leader_id, mut leader) = input_leader;
 		let mut leader_consumed = false;

pallets/ajuna-awesome-avatars/src/types/avatar/versions/v2/combinator/mod.rs

@@ -12,7 +12,6 @@ mod statue;
 mod tinker;
 
 use super::*;
-use sp_std::mem::variant_count;
 
 pub(super) type WrappedForgeItem<T> = (AvatarIdOf<T>, WrappedAvatar);
 

pallets/ajuna-awesome-avatars/src/types/avatar/versions/v2/mod.rs

@@ -23,7 +23,6 @@ use crate::{
 	Config,
 };
 use sp_runtime::DispatchError;
-use sp_std::{mem::variant_count, prelude::*};
 
 pub(crate) struct AttributeMapperV2;
 

pallets/ajuna-awesome-avatars/src/types/avatar/versions/v2/mutator.rs

@@ -221,7 +221,7 @@ impl<T: Config> AvatarMutator<T> for EquippableItemType {
 					ColorType::from_byte(DnaUtils::high_nibble_of(hash_byte)),
 					ColorType::from_byte(DnaUtils::low_nibble_of(hash_byte)),
 				);
-				let force = Force::from_byte(hash_provider.next() % variant_count::<Force>() as u8);
+				let force = Force::from_byte(hash_provider.next() % 7);
 
 				AvatarBuilder::with_base_avatar(base_avatar).try_into_weapon(
 					&pet_type,
@@ -289,7 +289,7 @@ impl<T: Config> AvatarMutator<T> for SpecialItemType {
 					ColorType::from_byte(DnaUtils::high_nibble_of(hash_byte)),
 					ColorType::from_byte(DnaUtils::low_nibble_of(hash_byte)),
 				);
-				let force = Force::from_byte(hash_provider.next() % variant_count::<Force>() as u8);
+				let force = Force::from_byte(hash_provider.next() % 7);
 
 				AvatarBuilder::with_base_avatar(base_avatar)
 					.into_unidentified(color_pair, force, soul_count)

pallets/ajuna-nft-staking/src/tests/ext/cancel.rs

@@ -48,7 +48,7 @@ fn works_with_token_reward() {
 		.build()
 		.execute_with(|| {
 			// Initial balances.
-			let initial_balance_bob = Balances::free_balance(&BOB);
+			let initial_balance_bob = Balances::free_balance(BOB);
 			assert_eq!(NftStake::account_balance(), reward);
 
 			// Cancel and check.
@@ -110,7 +110,7 @@ fn works_with_nft_reward() {
 		.build()
 		.execute_with(|| {
 			// Initial balances.
-			let initial_balance_bob = CurrencyOf::<Test>::free_balance(&BOB);
+			let initial_balance_bob = CurrencyOf::<Test>::free_balance(BOB);
 			assert_eq!(Nft::owner(reward_addr.0, reward_addr.1), Some(NftStake::account_id()));
 
 			// Cancel and check.

pallets/ajuna-nft-staking/src/tests/ext/claim.rs

@@ -48,10 +48,10 @@ fn works_with_token_reward() {
 		.accept_contract(vec![(BOB, stakes)], vec![(BOB, fees)], contract_id, BOB)
 		.build()
 		.execute_with(|| {
-			let initial_balance = Balances::free_balance(&BOB);
+			let initial_balance = Balances::free_balance(BOB);
 			let technical_account_id = Pallet::<Test>::account_id();
 
-			assert_eq!(Balances::free_balance(&technical_account_id), reward_amount);
+			assert_eq!(Balances::free_balance(technical_account_id), reward_amount);
 
 			let accepted_at = ContractAccepted::<Test>::get(contract_id).unwrap();
 			run_to_block(accepted_at + stake_duration + claim_duration + 1);
@@ -65,7 +65,7 @@ fn works_with_token_reward() {
 				assert_eq!(Nft::owner(collection_id, item_id), Some(ALICE));
 			}
 			assert_eq!(Balances::free_balance(BOB), initial_balance + reward_amount);
-			assert_eq!(Balances::free_balance(&technical_account_id), 0);
+			assert_eq!(Balances::free_balance(technical_account_id), 0);
 
 			let contract_collection_id = ContractCollectionId::<Test>::get().unwrap();
 			assert_eq!(Nft::owner(contract_collection_id, contract_id), None);
@@ -171,7 +171,7 @@ fn rejects_if_token_reward_is_less_than_min_balance() {
 		.execute_with(|| {
 			let technical_account_id = Pallet::<Test>::account_id();
 
-			assert_eq!(Balances::free_balance(&technical_account_id), 0);
+			assert_eq!(Balances::free_balance(technical_account_id), 0);
 
 			let accepted_at = ContractAccepted::<Test>::get(contract_id).unwrap();
 			run_to_block(accepted_at + stake_duration);

runtime/ajuna/src/lib.rs

@@ -13,7 +13,7 @@
 
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+#![allow(clippy::items_after_test_module)]
 #![cfg_attr(not(feature = "std"), no_std)]
 // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
 #![recursion_limit = "256"]

runtime/bajun/src/lib.rs

@@ -13,7 +13,7 @@
 
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+#![allow(clippy::items_after_test_module)]
 #![cfg_attr(not(feature = "std"), no_std)]
 // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
 #![recursion_limit = "256"]