Fixes, formatting

Author: Dinonard

Diff for: pallets/dapp-staking-migration/src/benchmarking.rs

@@ -18,10 +18,10 @@
 
 use super::{Pallet as Migration, *};
 
-use sp_std::vec;
 use astar_primitives::{dapp_staking::SmartContractHandle, Balance};
 use frame_benchmarking::{account as benchmark_account, v2::*};
 use pallet_dapp_staking_v3::StakeAmount;
+use sp_std::vec;
 
 fn smart_contract<T: Config>(idx: u8) -> T::SmartContract {
     let address: T::AccountId = benchmark_account("smart_contract", idx.into(), 456);

Diff for: precompiles/dapp-staking-v3/src/lib.rs

@@ -553,7 +553,7 @@ where
         // the entire amount from the origin to target contract.
         //
         // In case value comes from the past period, we don't care, since the `unstake` call will fall apart.
-        let stake_amount = if staked_amount > 0
+        let amount = if staked_amount > 0
             && staked_amount.saturating_sub(amount) < minimum_allowed_stake_amount
         {
             staked_amount
@@ -571,7 +571,7 @@ where
         // Then call stake on the target smart contract
         let stake_call = pallet_dapp_staking_v3::Call::<R>::stake {
             smart_contract: target_smart_contract,
-            amount: stake_amount,
+            amount,
         };
         RuntimeHelper::<R>::try_dispatch(handle, Some(origin).into(), stake_call)?;
 

Diff for: precompiles/dapp-staking-v3/src/test/tests_v2.rs

@@ -768,7 +768,7 @@ fn nomination_transfer_is_ok() {
     ExternalityBuilder::build().execute_with(|| {
         initialize();
 
-        // Register the first dApp, and stke on it.
+        // Register the first dApp, and stake on it.
         let staker_h160 = ALICE;
         let staker_native = AddressMapper::into_account_id(staker_h160);
         let smart_contract_address_1 = H160::repeat_byte(0xFA);

Diff for: runtime/shibuya/src/lib.rs

@@ -1379,7 +1379,6 @@ pub type Executive = frame_executive::Executive<
 ///
 /// Once done, migrations should be removed from the tuple.
 pub type Migrations =
-    // Part of shibuya-124
     (pallet_dapp_staking_migration::SingularStakingInfoTranslationUpgrade<Runtime>,);
 
 type EventRecord = frame_system::EventRecord<