fix fee pool threshold (#2293)

AcalaNetwork · Jul 28, 2022 · 78f2a1a · 78f2a1a
1 parent 2e6da86
commit 78f2a1a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 21 deletions.
diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs
@@ -1777,11 +1777,11 @@ parameter_types! {
 pub struct TransactionPaymentMigration;
 impl OnRuntimeUpgrade for TransactionPaymentMigration {
 	fn on_runtime_upgrade() -> frame_support::weights::Weight {
-		let poo_size = 5 * dollar(ACA);
-		let threshold = Ratio::saturating_from_rational(1, 2).saturating_mul_int(dollar(ACA));
+		let pool_size = 5 * dollar(ACA);
+		let threshold = Ratio::saturating_from_rational(1, 2).saturating_mul_int(pool_size);
 		for token in FeeTokens::get() {
 			let _ = module_transaction_payment::Pallet::<Runtime>::disable_pool(token);
-			let _ = module_transaction_payment::Pallet::<Runtime>::initialize_pool(token, poo_size, threshold);
+			let _ = module_transaction_payment::Pallet::<Runtime>::initialize_pool(token, pool_size, threshold);
 		}
 		<Runtime as frame_system::Config>::BlockWeights::get().max_block
 	}
@@ -1793,10 +1793,6 @@ impl OnRuntimeUpgrade for TransactionPaymentMigration {
 				module_transaction_payment::TokenExchangeRate::<Runtime>::contains_key(&token),
 				true
 			);
-			assert_eq!(
-				module_transaction_payment::GlobalFeeSwapPath::<Runtime>::contains_key(&token),
-				true
-			);
 		}
 		Ok(())
 	}

diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs
@@ -1810,11 +1810,11 @@ parameter_types! {
 pub struct TransactionPaymentMigration;
 impl OnRuntimeUpgrade for TransactionPaymentMigration {
 	fn on_runtime_upgrade() -> frame_support::weights::Weight {
-		let poo_size = 5 * dollar(KAR);
-		let threshold = Ratio::saturating_from_rational(1, 2).saturating_mul_int(dollar(KAR));
+		let pool_size = 5 * dollar(KAR);
+		let threshold = Ratio::saturating_from_rational(1, 2).saturating_mul_int(pool_size);
 		for token in FeeTokens::get() {
 			let _ = module_transaction_payment::Pallet::<Runtime>::disable_pool(token);
-			let _ = module_transaction_payment::Pallet::<Runtime>::initialize_pool(token, poo_size, threshold);
+			let _ = module_transaction_payment::Pallet::<Runtime>::initialize_pool(token, pool_size, threshold);
 		}
 		<Runtime as frame_system::Config>::BlockWeights::get().max_block
 	}
@@ -1826,10 +1826,6 @@ impl OnRuntimeUpgrade for TransactionPaymentMigration {
 				module_transaction_payment::TokenExchangeRate::<Runtime>::contains_key(&token),
 				true
 			);
-			assert_eq!(
-				module_transaction_payment::GlobalFeeSwapPath::<Runtime>::contains_key(&token),
-				true
-			);
 		}
 		Ok(())
 	}

diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs
@@ -1931,11 +1931,11 @@ parameter_types! {
 pub struct TransactionPaymentMigration;
 impl OnRuntimeUpgrade for TransactionPaymentMigration {
 	fn on_runtime_upgrade() -> frame_support::weights::Weight {
-		let poo_size = 5 * dollar(ACA);
-		let threshold = Ratio::saturating_from_rational(1, 2).saturating_mul_int(dollar(ACA));
+		let pool_size = 5 * dollar(ACA);
+		let threshold = Ratio::saturating_from_rational(1, 2).saturating_mul_int(pool_size);
 		for token in FeeTokens::get() {
 			let _ = module_transaction_payment::Pallet::<Runtime>::disable_pool(token);
-			let _ = module_transaction_payment::Pallet::<Runtime>::initialize_pool(token, poo_size, threshold);
+			let _ = module_transaction_payment::Pallet::<Runtime>::initialize_pool(token, pool_size, threshold);
 		}
 		<Runtime as frame_system::Config>::BlockWeights::get().max_block
 	}
@@ -1947,10 +1947,6 @@ impl OnRuntimeUpgrade for TransactionPaymentMigration {
 				module_transaction_payment::TokenExchangeRate::<Runtime>::contains_key(&token),
 				true
 			);
-			assert_eq!(
-				module_transaction_payment::GlobalFeeSwapPath::<Runtime>::contains_key(&token),
-				true
-			);
 		}
 		Ok(())
 	}