style: Migrate to stable-only rustfmt configuration
- Remove nightly-only features from .rustfmt.toml and vendor/ss58-registry/rustfmt.toml - Removed features: imports_granularity, wrap_comments, comment_width, reorder_impl_items, spaces_around_ranges, binop_separator, match_arm_blocks, trailing_semicolon, trailing_comma - Format all 898 affected files with stable rustfmt - Ensures long-term reliability without nightly toolchain dependency
This commit is contained in:
@@ -349,8 +349,8 @@ mod benchmarks {
|
||||
|
||||
// commission of 50% deducted here.
|
||||
assert!(
|
||||
T::StakeAdapter::active_stake(Pool::from(scenario.origin1)) >=
|
||||
scenario.dest_weight / 2u32.into()
|
||||
T::StakeAdapter::active_stake(Pool::from(scenario.origin1))
|
||||
>= scenario.dest_weight / 2u32.into()
|
||||
);
|
||||
}
|
||||
|
||||
@@ -989,8 +989,8 @@ mod benchmarks {
|
||||
assert_eq!(PoolMembers::<T>::get(&depositor).unwrap().total_balance(), deposit_amount);
|
||||
// verify delegated balance.
|
||||
assert!(
|
||||
T::StakeAdapter::member_delegation_balance(Member::from(depositor.clone())) ==
|
||||
Some(deposit_amount),
|
||||
T::StakeAdapter::member_delegation_balance(Member::from(depositor.clone()))
|
||||
== Some(deposit_amount),
|
||||
);
|
||||
|
||||
// ugly type conversion between balances of pezpallet staking and pools (which really are
|
||||
@@ -1013,8 +1013,8 @@ mod benchmarks {
|
||||
);
|
||||
// verify delegated balance are not yet slashed.
|
||||
assert!(
|
||||
T::StakeAdapter::member_delegation_balance(Member::from(depositor.clone())) ==
|
||||
Some(deposit_amount),
|
||||
T::StakeAdapter::member_delegation_balance(Member::from(depositor.clone()))
|
||||
== Some(deposit_amount),
|
||||
);
|
||||
|
||||
// Fill member's sub pools for the worst case.
|
||||
@@ -1049,8 +1049,8 @@ mod benchmarks {
|
||||
deposit_amount / 2u32.into()
|
||||
);
|
||||
assert!(
|
||||
T::StakeAdapter::member_delegation_balance(Member::from(depositor.clone())) ==
|
||||
Some(deposit_amount / 2u32.into()),
|
||||
T::StakeAdapter::member_delegation_balance(Member::from(depositor.clone()))
|
||||
== Some(deposit_amount / 2u32.into()),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1168,8 +1168,8 @@ mod benchmarks {
|
||||
}
|
||||
// verify balances once more.
|
||||
assert!(
|
||||
T::StakeAdapter::member_delegation_balance(Member::from(depositor.clone())) ==
|
||||
Some(deposit_amount),
|
||||
T::StakeAdapter::member_delegation_balance(Member::from(depositor.clone()))
|
||||
== Some(deposit_amount),
|
||||
);
|
||||
assert_eq!(PoolMembers::<T>::get(&depositor).unwrap().total_balance(), deposit_amount);
|
||||
}
|
||||
|
||||
@@ -267,8 +267,8 @@ fn main() {
|
||||
}
|
||||
|
||||
// execute sanity checks at a fixed interval, possibly on every block.
|
||||
if iteration %
|
||||
(std::env::var("SANITY_CHECK_INTERVAL")
|
||||
if iteration
|
||||
% (std::env::var("SANITY_CHECK_INTERVAL")
|
||||
.ok()
|
||||
.and_then(|x| x.parse::<u64>().ok()))
|
||||
.unwrap_or(1) == 0
|
||||
|
||||
@@ -644,9 +644,10 @@ impl<T: Config> PoolMember<T> {
|
||||
) -> Result<(), Error<T>> {
|
||||
if let Some(new_points) = self.points.checked_sub(&points_dissolved) {
|
||||
match self.unbonding_eras.get_mut(&unbonding_era) {
|
||||
Some(already_unbonding_points) =>
|
||||
Some(already_unbonding_points) => {
|
||||
*already_unbonding_points =
|
||||
already_unbonding_points.saturating_add(points_issued),
|
||||
already_unbonding_points.saturating_add(points_issued)
|
||||
},
|
||||
None => self
|
||||
.unbonding_eras
|
||||
.try_insert(unbonding_era, points_issued)
|
||||
@@ -1138,8 +1139,8 @@ impl<T: Config> BondedPool<T> {
|
||||
}
|
||||
|
||||
fn can_nominate(&self, who: &T::AccountId) -> bool {
|
||||
self.is_root(who) ||
|
||||
self.roles.nominator.as_ref().map_or(false, |nominator| nominator == who)
|
||||
self.is_root(who)
|
||||
|| self.roles.nominator.as_ref().map_or(false, |nominator| nominator == who)
|
||||
}
|
||||
|
||||
fn can_kick(&self, who: &T::AccountId) -> bool {
|
||||
@@ -1246,9 +1247,9 @@ impl<T: Config> BondedPool<T> {
|
||||
|
||||
// any unbond must comply with the balance condition:
|
||||
ensure!(
|
||||
is_full_unbond ||
|
||||
balance_after_unbond >=
|
||||
if is_depositor {
|
||||
is_full_unbond
|
||||
|| balance_after_unbond
|
||||
>= if is_depositor {
|
||||
Pezpallet::<T>::depositor_min_bond()
|
||||
} else {
|
||||
MinJoinBond::<T>::get()
|
||||
@@ -2876,8 +2877,8 @@ pub mod pezpallet {
|
||||
.ok_or(Error::<T>::PoolMemberNotFound)?
|
||||
.active_points();
|
||||
|
||||
if bonded_pool.points_to_balance(depositor_points) >=
|
||||
T::StakeAdapter::minimum_nominator_bond()
|
||||
if bonded_pool.points_to_balance(depositor_points)
|
||||
>= T::StakeAdapter::minimum_nominator_bond()
|
||||
{
|
||||
ensure!(bonded_pool.can_nominate(&who), Error::<T>::NotNominator);
|
||||
}
|
||||
@@ -3246,8 +3247,8 @@ pub mod pezpallet {
|
||||
// ensure pool exists.
|
||||
let bonded_pool = BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;
|
||||
ensure!(
|
||||
T::StakeAdapter::pool_strategy(Pool::from(bonded_pool.bonded_account())) ==
|
||||
adapter::StakeStrategyType::Transfer,
|
||||
T::StakeAdapter::pool_strategy(Pool::from(bonded_pool.bonded_account()))
|
||||
== adapter::StakeStrategyType::Transfer,
|
||||
Error::<T>::AlreadyMigrated
|
||||
);
|
||||
|
||||
@@ -3620,10 +3621,12 @@ impl<T: Config> Pezpallet<T> {
|
||||
)?;
|
||||
|
||||
let (points_issued, bonded) = match extra {
|
||||
BondExtra::FreeBalance(amount) =>
|
||||
(bonded_pool.try_bond_funds(&member_account, amount, BondType::Extra)?, amount),
|
||||
BondExtra::Rewards =>
|
||||
(bonded_pool.try_bond_funds(&member_account, claimed, BondType::Extra)?, claimed),
|
||||
BondExtra::FreeBalance(amount) => {
|
||||
(bonded_pool.try_bond_funds(&member_account, amount, BondType::Extra)?, amount)
|
||||
},
|
||||
BondExtra::Rewards => {
|
||||
(bonded_pool.try_bond_funds(&member_account, claimed, BondType::Extra)?, claimed)
|
||||
},
|
||||
};
|
||||
|
||||
bonded_pool.ok_to_be_open()?;
|
||||
@@ -3776,8 +3779,8 @@ impl<T: Config> Pezpallet<T> {
|
||||
) -> Result<BalanceOf<T>, DispatchError> {
|
||||
// only executed in tests: ensure the member account is correct.
|
||||
debug_assert!(
|
||||
PoolMembers::<T>::get(member_account.clone().get()).expect("member must exist") ==
|
||||
pool_member
|
||||
PoolMembers::<T>::get(member_account.clone().get()).expect("member must exist")
|
||||
== pool_member
|
||||
);
|
||||
|
||||
let pool_account = Pezpallet::<T>::generate_bonded_account(pool_member.pool_id);
|
||||
@@ -3879,8 +3882,8 @@ impl<T: Config> Pezpallet<T> {
|
||||
|
||||
for id in reward_pools {
|
||||
let account = Self::generate_reward_account(id);
|
||||
if T::Currency::reducible_balance(&account, Preservation::Expendable, Fortitude::Polite) <
|
||||
T::Currency::minimum_balance()
|
||||
if T::Currency::reducible_balance(&account, Preservation::Expendable, Fortitude::Polite)
|
||||
< T::Currency::minimum_balance()
|
||||
{
|
||||
log!(
|
||||
warn,
|
||||
@@ -3925,8 +3928,8 @@ impl<T: Config> Pezpallet<T> {
|
||||
RewardPools::<T>::iter_keys().try_for_each(|id| -> Result<(), TryRuntimeError> {
|
||||
// the sum of the pending rewards must be less than the leftover balance. Since the
|
||||
// reward math rounds down, we might accumulate some dust here.
|
||||
let pending_rewards_lt_leftover_bal = RewardPool::<T>::current_balance(id) >=
|
||||
pools_members_pending_rewards.get(&id).copied().unwrap_or_default();
|
||||
let pending_rewards_lt_leftover_bal = RewardPool::<T>::current_balance(id)
|
||||
>= pools_members_pending_rewards.get(&id).copied().unwrap_or_default();
|
||||
|
||||
// If this happens, this is most likely due to an old bug and not a recent code change.
|
||||
// We warn about this in try-runtime checks but do not panic.
|
||||
@@ -3958,8 +3961,8 @@ impl<T: Config> Pezpallet<T> {
|
||||
|
||||
let depositor = PoolMembers::<T>::get(&bonded_pool.roles.depositor).unwrap();
|
||||
let depositor_has_enough_stake = bonded_pool
|
||||
.is_destroying_and_only_depositor(depositor.active_points()) ||
|
||||
depositor.active_points() >= MinCreateBond::<T>::get();
|
||||
.is_destroying_and_only_depositor(depositor.active_points())
|
||||
|| depositor.active_points() >= MinCreateBond::<T>::get();
|
||||
if !depositor_has_enough_stake {
|
||||
log!(
|
||||
warn,
|
||||
@@ -4162,8 +4165,8 @@ impl<T: Config> Pezpallet<T> {
|
||||
let pool_account = Self::generate_bonded_account(pool_id);
|
||||
|
||||
// true if pool is still not migrated to `DelegateStake`.
|
||||
T::StakeAdapter::pool_strategy(Pool::from(pool_account)) !=
|
||||
adapter::StakeStrategyType::Delegate
|
||||
T::StakeAdapter::pool_strategy(Pool::from(pool_account))
|
||||
!= adapter::StakeStrategyType::Delegate
|
||||
}
|
||||
|
||||
/// Checks whether member delegation needs to be migrated to
|
||||
|
||||
@@ -134,8 +134,8 @@ pub mod unversioned {
|
||||
let pool_acc = Pezpallet::<T>::generate_bonded_account(id);
|
||||
|
||||
// only migrate if the pool is in Transfer Strategy.
|
||||
if T::StakeAdapter::pool_strategy(Pool::from(pool_acc)) ==
|
||||
adapter::StakeStrategyType::Transfer
|
||||
if T::StakeAdapter::pool_strategy(Pool::from(pool_acc))
|
||||
== adapter::StakeStrategyType::Transfer
|
||||
{
|
||||
let _ = Pezpallet::<T>::migrate_to_delegate_stake(id).map_err(|err| {
|
||||
log!(
|
||||
@@ -198,8 +198,8 @@ pub mod unversioned {
|
||||
BondedPools::<T>::iter_keys().take(MaxPools::get() as usize).enumerate()
|
||||
{
|
||||
let pool_account = Pezpallet::<T>::generate_bonded_account(id);
|
||||
if T::StakeAdapter::pool_strategy(Pool::from(pool_account.clone())) ==
|
||||
adapter::StakeStrategyType::Transfer
|
||||
if T::StakeAdapter::pool_strategy(Pool::from(pool_account.clone()))
|
||||
== adapter::StakeStrategyType::Transfer
|
||||
{
|
||||
log!(error, "Pool {} failed to migrate", id,);
|
||||
return Err(TryRuntimeError::Other("Pool failed to migrate"));
|
||||
@@ -518,8 +518,8 @@ pub mod v5 {
|
||||
"There are undecodable BondedPools in storage. This migration will not fix that."
|
||||
);
|
||||
ensure!(
|
||||
SubPoolsStorage::<T>::iter_keys().count() ==
|
||||
SubPoolsStorage::<T>::iter_values().count(),
|
||||
SubPoolsStorage::<T>::iter_keys().count()
|
||||
== SubPoolsStorage::<T>::iter_values().count(),
|
||||
"There are undecodable SubPools in storage. This migration will not fix that."
|
||||
);
|
||||
ensure!(
|
||||
@@ -552,10 +552,10 @@ pub mod v5 {
|
||||
// `total_commission_claimed` field.
|
||||
ensure!(
|
||||
RewardPools::<T>::iter().all(|(_, reward_pool)| reward_pool
|
||||
.total_commission_pending >=
|
||||
Zero::zero() && reward_pool
|
||||
.total_commission_claimed >=
|
||||
Zero::zero()),
|
||||
.total_commission_pending
|
||||
>= Zero::zero() && reward_pool
|
||||
.total_commission_claimed
|
||||
>= Zero::zero()),
|
||||
"a commission value has been incorrectly set"
|
||||
);
|
||||
ensure!(
|
||||
@@ -573,8 +573,8 @@ pub mod v5 {
|
||||
"There are undecodable BondedPools in storage."
|
||||
);
|
||||
ensure!(
|
||||
SubPoolsStorage::<T>::iter_keys().count() ==
|
||||
SubPoolsStorage::<T>::iter_values().count(),
|
||||
SubPoolsStorage::<T>::iter_keys().count()
|
||||
== SubPoolsStorage::<T>::iter_values().count(),
|
||||
"There are undecodable SubPools in storage."
|
||||
);
|
||||
ensure!(
|
||||
|
||||
@@ -171,8 +171,8 @@ impl pezsp_staking::StakingInterface for StakingMock {
|
||||
DelegateMock::on_withdraw(who, withdraw_amount);
|
||||
|
||||
UnbondingBalanceMap::set(&unbonding_map);
|
||||
Ok(UnbondingBalanceMap::get().get(&who).unwrap().is_empty() &&
|
||||
BondedBalanceMap::get().get(&who).unwrap().is_zero())
|
||||
Ok(UnbondingBalanceMap::get().get(&who).unwrap().is_empty()
|
||||
&& BondedBalanceMap::get().get(&who).unwrap().is_zero())
|
||||
}
|
||||
|
||||
fn bond(stash: &Self::AccountId, value: Self::Balance, _: &Self::AccountId) -> DispatchResult {
|
||||
|
||||
@@ -190,7 +190,13 @@ impl pezpallet_nomination_pools::adapter::StakeStrategy for MockAdapter {
|
||||
bond_type: BondType,
|
||||
) -> DispatchResult {
|
||||
if LegacyAdapter::get() {
|
||||
return TransferStake::pledge_bond(who, pool_account, reward_account, amount, bond_type);
|
||||
return TransferStake::pledge_bond(
|
||||
who,
|
||||
pool_account,
|
||||
reward_account,
|
||||
amount,
|
||||
bond_type,
|
||||
);
|
||||
}
|
||||
DelegateStake::pledge_bond(who, pool_account, reward_account, amount, bond_type)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user