Skip to content

Commit 87cc1da

Browse files
ipapandinasipapandinas
committed
make CI happy
1 parent 956f0f0 commit 87cc1da

File tree

9 files changed

+58
-52
lines changed

9 files changed

+58
-52
lines changed

‎pallets/dapp-staking/src/benchmarking/mod.rs‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,16 +1145,13 @@ mod benchmarks {
11451145
});
11461146
EraRewards::<T>::insert(&cleanup_marker.era_reward_index, reward_span);
11471147

1148-
let rank_points: BoundedVec<
1149-
BoundedVec<u8, ConstU32<15>>,
1150-
T::NumberOfTiers,
1151-
> = (1..=T::NumberOfTiers::get())
1148+
let rank_points: BoundedVec<BoundedVec<u8, ConstU32<15>>, T::NumberOfTiers> = (1
1149+
..=T::NumberOfTiers::get())
11521150
.map(|slots| {
1153-
let inner: BoundedVec<u8, ConstU32<15>> =
1154-
(1..=slots as u8)
1155-
.collect::<Vec<_>>()
1156-
.try_into()
1157-
.expect("Using incremental points; QED.");
1151+
let inner: BoundedVec<u8, ConstU32<15>> = (1..=slots as u8)
1152+
.collect::<Vec<_>>()
1153+
.try_into()
1154+
.expect("Using incremental points; QED.");
11581155
inner
11591156
})
11601157
.collect::<Vec<_>>()

‎pallets/dapp-staking/src/benchmarking/utils.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ pub(super) fn init_tier_settings<T: Config>() {
204204
BoundedVec::try_from(vec![1u8, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]).unwrap(),
205205
BoundedVec::try_from(vec![1u8, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]).unwrap(),
206206
])
207-
.unwrap(),
207+
.unwrap(),
208208
base_reward_portion: Permill::from_percent(50),
209209
};
210210

‎pallets/dapp-staking/src/migration.rs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ pub trait TierParamsV11Config {
5555

5656
mod v11 {
5757
use super::*;
58-
use crate::migration::v10::{
59-
DAppTierRewards as DAppTierRewardsV10,
60-
};
58+
use crate::migration::v10::DAppTierRewards as DAppTierRewardsV10;
6159

6260
pub struct VersionMigrateV10ToV11<T, P>(PhantomData<(T, P)>);
6361

@@ -93,8 +91,9 @@ mod v11 {
9391
rank_points_config
9492
.into_iter()
9593
.map(|points| BoundedVec::try_from(points).expect("rank points"))
96-
.collect::<Vec<_>>()
97-
).expect("4 tiers"),
94+
.collect::<Vec<_>>(),
95+
)
96+
.expect("4 tiers"),
9897
base_reward_portion: P::base_reward_portion(),
9998
};
10099

@@ -131,8 +130,9 @@ mod v11 {
131130
}
132131

133132
reads += 1;
134-
let maybe_old: Option<DAppTierRewardsV10<T::MaxNumberOfContracts, T::NumberOfTiers>> =
135-
v10::DAppTiers::<T>::get(era);
133+
let maybe_old: Option<
134+
DAppTierRewardsV10<T::MaxNumberOfContracts, T::NumberOfTiers>,
135+
> = v10::DAppTiers::<T>::get(era);
136136

137137
match maybe_old {
138138
Some(old) => {
@@ -232,14 +232,14 @@ mod v11 {
232232
ensure!(new_params.is_valid(), "New tier params invalid");
233233

234234
let new_count = DAppTiers::<T>::iter().count() as u32;
235-
ensure!(
236-
new_count == expected_count,
237-
"DAppTiers count mismatch"
238-
);
235+
ensure!(new_count == expected_count, "DAppTiers count mismatch");
239236

240237
for (era, rewards) in DAppTiers::<T>::iter() {
241238
ensure!(era >= oldest_valid_era, "Found expired entry");
242-
ensure!(rewards.rank_points.is_empty(), "Should have empty rank_points");
239+
ensure!(
240+
rewards.rank_points.is_empty(),
241+
"Should have empty rank_points"
242+
);
243243
}
244244

245245
ensure!(
@@ -269,10 +269,10 @@ mod v10 {
269269
/// v10 storage alias for DAppTiers
270270
#[storage_alias]
271271
pub type DAppTiers<T: Config> = StorageMap<
272-
Pallet<T>,
273-
Twox64Concat,
274-
EraNumber,
275-
DAppTierRewards<<T as Config>::MaxNumberOfContracts, <T as Config>::NumberOfTiers>,
276-
OptionQuery,
272+
Pallet<T>,
273+
Twox64Concat,
274+
EraNumber,
275+
DAppTierRewards<<T as Config>::MaxNumberOfContracts, <T as Config>::NumberOfTiers>,
276+
OptionQuery,
277277
>;
278278
}

‎precompiles/dapp-staking/src/test/mock.rs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -303,13 +303,12 @@ impl ExternalityBuilder {
303303
slot_number_args: STANDARD_TIER_SLOTS_ARGS,
304304
slots_per_tier: vec![10, 20, 30, 40],
305305
safeguard: None,
306-
rank_points: BoundedVec::try_from(vec![
307-
BoundedVec::try_from(vec![1u8]).unwrap(),
308-
BoundedVec::try_from(vec![1u8, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]).unwrap(),
309-
BoundedVec::try_from(vec![1u8, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]).unwrap(),
310-
BoundedVec::try_from(vec![1u8, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]).unwrap(),
311-
])
312-
.unwrap(),
306+
rank_points: vec![
307+
vec![1u8],
308+
vec![1u8, 2, 3, 4, 5, 6, 7, 8, 9, 10],
309+
vec![1u8, 2, 3, 4, 5, 6, 7, 8, 9, 10],
310+
vec![1u8, 2, 3, 4, 5, 6, 7, 8, 9, 10],
311+
],
313312
base_reward_portion: Permill::from_percent(50),
314313
_config: PhantomData,
315314
},

‎runtime/astar/src/genesis_config.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
// along with Astar. If not, see <http://www.gnu.org/licenses/>.
1818

1919
use crate::*;
20-
use astar_primitives::{dapp_staking::MAX_ENCODED_RANK, evm::EVM_REVERT_CODE, genesis::GenesisAccount, parachain::ASTAR_ID};
20+
use astar_primitives::{
21+
dapp_staking::MAX_ENCODED_RANK, evm::EVM_REVERT_CODE, genesis::GenesisAccount,
22+
parachain::ASTAR_ID,
23+
};
2124

2225
/// Provides the JSON representation of predefined genesis config for given `id`.
2326
pub fn get_preset(id: &sp_genesis_builder::PresetId) -> Option<Vec<u8>> {

‎runtime/astar/src/lib.rs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1788,10 +1788,10 @@ impl pallet_dapp_staking::migration::TierParamsV11Config for AstarTierParamsV11
17881788

17891789
fn rank_points() -> [Vec<u8>; 4] {
17901790
[
1791-
vec![], // Tier 0: dummy
1792-
vec![10, 11, 12, 13, 14, 15], // Tier 1: 6 slots
1793-
vec![1, 3, 5, 7, 9, 11, 13, 15, 17, 19], // Tier 2: 10 slots
1794-
vec![], // Tier 3: dummy
1791+
vec![], // Tier 0: dummy
1792+
vec![10, 11, 12, 13, 14, 15], // Tier 1: 6 slots
1793+
vec![1, 3, 5, 7, 9, 11, 13, 15, 17, 19], // Tier 2: 10 slots
1794+
vec![], // Tier 3: dummy
17951795
]
17961796
}
17971797

@@ -1806,7 +1806,8 @@ impl pallet_dapp_staking::migration::TierParamsV11Config for AstarTierParamsV11
18061806
pub type Migrations = (Unreleased, Permanent);
18071807

18081808
/// Unreleased migrations. Add new ones here:
1809-
pub type Unreleased = (pallet_dapp_staking::migration::versioned_migrations::V10ToV11<Runtime, AstarTierParamsV11>,);
1809+
pub type Unreleased =
1810+
(pallet_dapp_staking::migration::versioned_migrations::V10ToV11<Runtime, AstarTierParamsV11>,);
18101811

18111812
/// Migrations/checks that do not need to be versioned and can run on every upgrade.
18121813
pub type Permanent = (pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,);

‎runtime/shibuya/src/lib.rs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1795,10 +1795,10 @@ impl pallet_dapp_staking::migration::TierParamsV11Config for ShibuyaTierParamsV1
17951795

17961796
fn rank_points() -> [Vec<u8>; 4] {
17971797
[
1798-
vec![], // Tier 0: dummy
1799-
vec![10, 11, 12, 13, 14, 15], // Tier 1: 6 slots
1800-
vec![1, 3, 5, 7, 9, 11, 13, 15, 17, 19], // Tier 2: 10 slots
1801-
vec![], // Tier 3: dummy
1798+
vec![], // Tier 0: dummy
1799+
vec![10, 11, 12, 13, 14, 15], // Tier 1: 6 slots
1800+
vec![1, 3, 5, 7, 9, 11, 13, 15, 17, 19], // Tier 2: 10 slots
1801+
vec![], // Tier 3: dummy
18021802
]
18031803
}
18041804

@@ -1813,7 +1813,9 @@ impl pallet_dapp_staking::migration::TierParamsV11Config for ShibuyaTierParamsV1
18131813
pub type Migrations = (Unreleased, Permanent);
18141814

18151815
/// Unreleased migrations. Add new ones here:
1816-
pub type Unreleased = (pallet_dapp_staking::migration::versioned_migrations::V10ToV11<Runtime, ShibuyaTierParamsV11>,);
1816+
pub type Unreleased = (
1817+
pallet_dapp_staking::migration::versioned_migrations::V10ToV11<Runtime, ShibuyaTierParamsV11>,
1818+
);
18171819

18181820
/// Migrations/checks that do not need to be versioned and can run on every upgrade.
18191821
pub type Permanent = (pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,);

‎runtime/shiden/src/genesis_config.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
// along with Astar. If not, see <http://www.gnu.org/licenses/>.
1818

1919
use crate::*;
20-
use astar_primitives::{dapp_staking::MAX_ENCODED_RANK, evm::EVM_REVERT_CODE, genesis::GenesisAccount, parachain::SHIDEN_ID};
20+
use astar_primitives::{
21+
dapp_staking::MAX_ENCODED_RANK, evm::EVM_REVERT_CODE, genesis::GenesisAccount,
22+
parachain::SHIDEN_ID,
23+
};
2124

2225
/// Provides the JSON representation of predefined genesis config for given `id`.
2326
pub fn get_preset(id: &sp_genesis_builder::PresetId) -> Option<Vec<u8>> {

‎runtime/shiden/src/lib.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,10 +1358,10 @@ impl pallet_dapp_staking::migration::TierParamsV11Config for ShidenTierParamsV11
13581358

13591359
fn rank_points() -> [Vec<u8>; 4] {
13601360
[
1361-
vec![], // Tier 0: dummy
1362-
vec![10, 11, 12, 13, 14, 15], // Tier 1: 6 slots
1363-
vec![1, 3, 5, 7, 9, 11, 13, 15, 17, 19], // Tier 2: 10 slots
1364-
vec![], // Tier 3: dummy
1361+
vec![], // Tier 0: dummy
1362+
vec![10, 11, 12, 13, 14, 15], // Tier 1: 6 slots
1363+
vec![1, 3, 5, 7, 9, 11, 13, 15, 17, 19], // Tier 2: 10 slots
1364+
vec![], // Tier 3: dummy
13651365
]
13661366
}
13671367

@@ -1376,8 +1376,9 @@ impl pallet_dapp_staking::migration::TierParamsV11Config for ShidenTierParamsV11
13761376
pub type Migrations = (Unreleased, Permanent);
13771377

13781378
/// Unreleased migrations. Add new ones here:
1379-
pub type Unreleased = (pallet_dapp_staking::migration::versioned_migrations::V10ToV11<Runtime, ShidenTierParamsV11>,);
1380-
1379+
pub type Unreleased = (
1380+
pallet_dapp_staking::migration::versioned_migrations::V10ToV11<Runtime, ShidenTierParamsV11>,
1381+
);
13811382

13821383
/// Migrations/checks that do not need to be versioned and can run on every upgrade.
13831384
pub type Permanent = (pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,);

0 commit comments

Comments
 (0)