ajuna-network · cowboy-bebug · Jun 6, 2023 · Jun 6, 2023 · Jun 6, 2023 · Jun 6, 2023
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -17,5 +17,6 @@ rustflags = [
     "-Aclippy::derive_partial_eq_without_eq",
     "-Aclippy::too_many_arguments",
     "-Aclippy::type_complexity",
+    "-Aclippy::uninlined-format-args",
     "-Aclippy::unnecessary_cast",
 ]
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -83,14 +83,15 @@ jobs:
       matrix:
         runtime: [bajun, ajuna]
     env:
-      SUBWASM_VERSION: v0.18.0
+      SUBWASM_VERSION: v0.19.1
     steps:
-      - run: sudo apt-get install -y protobuf-compiler
       - uses: actions/checkout@v3
       - id: srtool_build
-        uses: chevdor/srtool-actions@v0.6.0
+        uses: chevdor/srtool-actions@v0.7.0
         with:
+          image: paritytech/srtool
           chain: ${{ matrix.runtime }}
+          tag: 1.66.1
       - name: Install subwasm {{ env.SUBWASM_VERSION }}
         run: |
           wget https://github.com/chevdor/subwasm/releases/download/${{ env.SUBWASM_VERSION }}/subwasm_linux_amd64_${{ env.SUBWASM_VERSION }}.deb -O subwasm.deb

diff --git a/pallets/ajuna-awesome-avatars/src/tests.rs b/pallets/ajuna-awesome-avatars/src/tests.rs
@@ -20,7 +20,6 @@ use sp_runtime::{testing::H256, ArithmeticError, DispatchError};
 
 fn create_avatars(season_id: SeasonId, account: MockAccountId, n: u8) -> Vec<AvatarIdOf<Test>> {
 	(0..n)
-		.into_iter()
 		.map(|i| {
 			let avatar = Avatar::default().season_id(season_id).dna(&[i; 32]);
 			let avatar_id = H256::random();
@@ -186,12 +185,12 @@ mod treasury {
 				Treasurer::<Test>::insert(SEASON_ID, BOB);
 				assert_eq!(Treasury::<Test>::get(SEASON_ID), 0);
 				assert_eq!(Balances::total_balance(&BOB), initial_balance);
-				assert_eq!(Balances::free_balance(&treasury_account), 0);
+				assert_eq!(Balances::free_balance(treasury_account), 0);
 				assert_eq!(Balances::total_issuance(), total_supply);
 
 				deposit_into_treasury(SEASON_ID, 333);
 				assert_eq!(Treasury::<Test>::get(SEASON_ID), 333);
-				assert_eq!(Balances::free_balance(&treasury_account), 333);
+				assert_eq!(Balances::free_balance(treasury_account), 333);
 				assert_noop!(
 					AAvatars::claim_treasury(RuntimeOrigin::signed(BOB), SEASON_ID),
 					Error::<Test>::CannotClaimDuringSeason
@@ -201,7 +200,7 @@ mod treasury {
 				assert_ok!(AAvatars::claim_treasury(RuntimeOrigin::signed(BOB), SEASON_ID));
 				assert_eq!(Treasury::<Test>::get(SEASON_ID), 0);
 				assert_eq!(Balances::total_balance(&BOB), initial_balance + 333);
-				assert_eq!(Balances::free_balance(&treasury_account), 0);
+				assert_eq!(Balances::free_balance(treasury_account), 0);
 				assert_eq!(Balances::total_issuance(), total_supply + 333); // total supply increases from injection
 				System::assert_last_event(mock::RuntimeEvent::AAvatars(
 					crate::Event::TreasuryClaimed {
@@ -371,7 +370,7 @@ mod treasury {
 				run_to_block(season_1.end + 1);
 				Treasurer::<Test>::insert(1, CHARLIE);
 				Treasury::<Test>::insert(1, 999);
-				assert!(Balances::free_balance(&AAvatars::treasury_account_id()) < 999);
+				assert!(Balances::free_balance(AAvatars::treasury_account_id()) < 999);
 				assert_noop!(
 					AAvatars::claim_treasury(RuntimeOrigin::signed(CHARLIE), SEASON_ID),
 					pallet_balances::Error::<Test>::InsufficientBalance
@@ -2699,13 +2698,13 @@ mod trading {
 				let treasury_account = AAvatars::treasury_account_id();
 
 				assert_eq!(Treasury::<Test>::get(SEASON_ID), treasury_balance_season_1);
-				assert_eq!(Balances::free_balance(&treasury_account), treasury_balance_season_1);
+				assert_eq!(Balances::free_balance(treasury_account), treasury_balance_season_1);
 				assert_eq!(Balances::total_issuance(), total_supply);
 
 				run_to_block(season.start);
 				let avatar_ids = create_avatars(SEASON_ID, BOB, 3);
 				assert_eq!(Treasury::<Test>::get(SEASON_ID), treasury_balance_season_1);
-				assert_eq!(Balances::free_balance(&treasury_account), treasury_balance_season_1);
+				assert_eq!(Balances::free_balance(treasury_account), treasury_balance_season_1);
 
 				let owned_by_alice = Owners::<Test>::get(ALICE, SEASON_ID);
 				let owned_by_bob = Owners::<Test>::get(BOB, SEASON_ID);
@@ -2719,7 +2718,7 @@ mod trading {
 				assert_eq!(Balances::free_balance(ALICE), alice_initial_bal - price - min_fee);
 				assert_eq!(Balances::free_balance(BOB), bob_initial_bal + price);
 				assert_eq!(Treasury::<Test>::get(SEASON_ID), treasury_balance_season_1);
-				assert_eq!(Balances::free_balance(&treasury_account), treasury_balance_season_1);
+				assert_eq!(Balances::free_balance(treasury_account), treasury_balance_season_1);
 				assert_eq!(Balances::total_issuance(), total_supply);
 
 				// check for ownership transfer
@@ -2895,7 +2894,7 @@ mod account {
 				assert_eq!(Accounts::<Test>::get(ALICE).storage_tier, StorageTier::One);
 				assert_eq!(Accounts::<Test>::get(ALICE).storage_tier as isize, 25);
 				assert_eq!(
-					Balances::free_balance(&AAvatars::treasury_account_id()),
+					Balances::free_balance(AAvatars::treasury_account_id()),
 					treasury_balance
 				);
 				assert_eq!(Balances::total_issuance(), total_supply);
@@ -2905,7 +2904,7 @@ mod account {
 				assert_eq!(Accounts::<Test>::get(ALICE).storage_tier as isize, 50);
 				treasury_balance += upgrade_fee;
 				assert_eq!(
-					Balances::free_balance(&AAvatars::treasury_account_id()),
+					Balances::free_balance(AAvatars::treasury_account_id()),
 					treasury_balance
 				);
 				assert_eq!(Balances::total_issuance(), total_supply);
@@ -2915,7 +2914,7 @@ mod account {
 				assert_eq!(Accounts::<Test>::get(ALICE).storage_tier as isize, 75);
 				treasury_balance += upgrade_fee;
 				assert_eq!(
-					Balances::free_balance(&AAvatars::treasury_account_id()),
+					Balances::free_balance(AAvatars::treasury_account_id()),
 					treasury_balance
 				);
 				assert_eq!(Balances::total_issuance(), total_supply);
@@ -2925,7 +2924,7 @@ mod account {
 				assert_eq!(Accounts::<Test>::get(ALICE).storage_tier as isize, 100);
 				treasury_balance += upgrade_fee;
 				assert_eq!(
-					Balances::free_balance(&AAvatars::treasury_account_id()),
+					Balances::free_balance(AAvatars::treasury_account_id()),
 					treasury_balance
 				);
 				assert_eq!(Balances::total_issuance(), total_supply);

diff --git a/pallets/ajuna-awesome-avatars/src/types/avatar/versions/v2/avatar_utils.rs b/pallets/ajuna-awesome-avatars/src/types/avatar/versions/v2/avatar_utils.rs
@@ -925,7 +925,7 @@ impl AvatarUtils {
 			0xED, 0xCD, 0x03, 0x47,
 		];
 
-		let mut all_enum = T::range().into_iter().map(|variant| variant as u8).collect::<Vec<_>>();
+		let mut all_enum = T::range().map(|variant| variant as u8).collect::<Vec<_>>();
 		let mut pattern = Vec::with_capacity(4);
 
 		for _ in 0..4 {

diff --git a/pallets/ajuna-awesome-avatars/src/types/avatar/versions/v2/combinator/breed.rs b/pallets/ajuna-awesome-avatars/src/types/avatar/versions/v2/combinator/breed.rs
@@ -108,7 +108,6 @@ mod test {
 			let unit_closure = |avatar| avatar;
 
 			let mut avatar_set = (0..5)
-				.into_iter()
 				.map(|i| {
 					create_random_avatar::<Test, _>(&ALICE, Some(hash_base[i]), Some(unit_closure))
 				})
@@ -157,7 +156,6 @@ mod test {
 			];
 
 			let mut egg_set = (0..5)
-				.into_iter()
 				.map(|i| {
 					let soul_points = ((progress_arrays[i][2] | progress_arrays[i][6]) % 99) + 1;
 
@@ -207,7 +205,6 @@ mod test {
 			];
 
 			let mut egg_set = (0..5)
-				.into_iter()
 				.map(|i| {
 					let soul_points = ((progress_arrays[i][2] | progress_arrays[i][6]) % 99) + 1;
 

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel    = "nightly-2022-10-22"
+channel    = "nightly-2023-01-10"
 components = [ "clippy", "rustfmt" ]
 profile    = "minimal"
 targets    = [ "wasm32-unknown-unknown" ]