review

Author: kostekIV

.github/workflows/e2e-tests-main-devnet.yml

@@ -345,22 +345,6 @@ jobs:
           follow-up-finalization-check: true
         timeout-minutes: 3
 
-
-  # run-e2e-fee-calculation:
-  #   needs: [build-test-docker, build-test-client]
-  #   name: Run e2e fee calculation test
-  #   runs-on: ubuntu-20.04
-  #   steps:
-  #     - name: Checkout source code
-  #       uses: actions/checkout@v2
-
-  #     - name: Run e2e test
-  #       uses: ./.github/actions/run-e2e-test
-  #       with:
-  #         test-case: fee_calculation
-  #       timeout-minutes: 2
-
-
   run-e2e-validators-rotate:
     needs: [build-test-docker, build-test-client]
     name: Run validators rotation test
@@ -706,7 +690,6 @@ jobs:
       run-e2e-staking-era-payouts-test,
       run-e2e-staking-new-validator-test,
       run-e2e-change-validators-test,
-      # run-e2e-fee-calculation,
       run-e2e-validators-rotate,
       run-e2e-era-payout,
       run-e2e-era-validators,

bin/runtime/src/lib.rs

@@ -27,6 +27,7 @@ use frame_support::{
     PalletId,
 };
 use frame_system::{EnsureRoot, EnsureSignedBy};
+use pallet_balances::migration::MigrateManyToTrackInactive;
 pub use pallet_balances::Call as BalancesCall;
 pub use pallet_timestamp::Call as TimestampCall;
 use pallet_transaction_payment::{CurrencyAdapter, Multiplier, TargetedFeeAdjustment};
@@ -39,7 +40,7 @@ use primitives::{
 };
 use sp_api::impl_runtime_apis;
 use sp_consensus_aura::{sr25519::AuthorityId as AuraId, SlotDuration};
-use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
+use sp_core::{crypto::KeyTypeId, Get, OpaqueMetadata};
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
 use sp_runtime::{
@@ -745,6 +746,13 @@ construct_runtime!(
     }
 );
 
+pub struct EmptyList;
+impl Get<Vec<AccountId>> for EmptyList {
+    fn get() -> Vec<AccountId> {
+        vec![]
+    }
+}
+
 /// The address format for describing accounts.
 pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
 /// Block header type as expected by this runtime.
@@ -777,6 +785,7 @@ pub type Executive = frame_executive::Executive<
     frame_system::ChainContext<Runtime>,
     Runtime,
     AllPalletsWithSystem,
+    (MigrateManyToTrackInactive<Runtime, EmptyList>,),
 >;
 
 impl_runtime_apis! {

e2e-tests/src/test/fee.rs

@@ -4,7 +4,6 @@ pub use ban::{
 pub use electing_validators::authorities_are_staking;
 pub use era_payout::era_payouts_calculated_correctly;
 pub use era_validators::era_validators;
-// pub use fee::fee_calculation;
 pub use finality_version::{
     finality_version_change, schedule_doomed_version_change_and_verify_finalization_stopped,
     schedule_version_change,
@@ -25,7 +24,6 @@ mod ban;
 mod electing_validators;
 mod era_payout;
 mod era_validators;
-mod fee;
 mod finality_version;
 mod finalization;
 mod helpers;

e2e-tests/src/test/mod.rs

@@ -12,10 +12,7 @@ use aleph_client::{
 use log::info;
 use primitives::Balance;
 
-use crate::{
-    accounts::get_validators_raw_keys, config::setup_test, test::fee::current_fees,
-    transfer::setup_for_transfer,
-};
+use crate::{accounts::get_validators_raw_keys, config::setup_test, transfer::setup_for_transfer};
 
 /// Returns current treasury free funds and total issuance.
 ///
@@ -155,3 +152,28 @@ async fn reject_treasury_proposal(connection: &RootConnection, id: u32) -> anyho
 
     Ok(())
 }
+
+async fn current_fees(
+    connection: &SignedConnection,
+    to: AccountId,
+    tip: Option<Balance>,
+    transfer_value: Balance,
+) -> (Balance, u128) {
+    let actual_multiplier = connection.get_next_fee_multiplier(None).await;
+
+    let tx_info = match tip {
+        None => connection.transfer(to, transfer_value, TxStatus::Finalized),
+        Some(tip) => connection.transfer_with_tip(to, transfer_value, tip, TxStatus::Finalized),
+    }
+    .await
+    .unwrap();
+
+    let events = connection.get_tx_events(tx_info).await.unwrap();
+    let event = events.find_first::<TransactionFeePaid>().unwrap().unwrap();
+
+    let fee = event.actual_fee;
+
+    info!("fee payed: {}", fee);
+
+    (fee, actual_multiplier)
+}