From deeaa1c8fd36f8ee7d598ae8fd2b23ea9e4cd9f7 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Fri, 13 Jan 2023 13:47:18 +0000
Subject: [PATCH] Use the balance trait as we have one (#13136)
---
.../asset-tx-payment/src/payment.rs | 14 +++-----------
.../frame/transaction-payment/src/payment.rs | 17 ++++-------------
2 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/substrate/frame/transaction-payment/asset-tx-payment/src/payment.rs b/substrate/frame/transaction-payment/asset-tx-payment/src/payment.rs
index 80ff4e40dcf..85d1bec4b27 100644
--- a/substrate/frame/transaction-payment/asset-tx-payment/src/payment.rs
+++ b/substrate/frame/transaction-payment/asset-tx-payment/src/payment.rs
@@ -21,15 +21,13 @@ use codec::FullCodec;
use frame_support::{
traits::{
fungibles::{Balanced, CreditOf, Inspect},
- tokens::BalanceConversion,
+ tokens::{Balance, BalanceConversion},
},
unsigned::TransactionValidityError,
};
use scale_info::TypeInfo;
use sp_runtime::{
- traits::{
- AtLeast32BitUnsigned, DispatchInfoOf, MaybeSerializeDeserialize, One, PostDispatchInfoOf,
- },
+ traits::{DispatchInfoOf, MaybeSerializeDeserialize, One, PostDispatchInfoOf},
transaction_validity::InvalidTransaction,
};
use sp_std::{fmt::Debug, marker::PhantomData};
@@ -37,13 +35,7 @@ use sp_std::{fmt::Debug, marker::PhantomData};
/// Handle withdrawing, refunding and depositing of transaction fees.
pub trait OnChargeAssetTransaction<T: Config> {
/// The underlying integer type in which fees are calculated.
- type Balance: AtLeast32BitUnsigned
- + FullCodec
- + Copy
- + MaybeSerializeDeserialize
- + Debug
- + Default
- + TypeInfo;
+ type Balance: Balance;
/// The type used to identify the assets used for transaction payment.
type AssetId: FullCodec + Copy + MaybeSerializeDeserialize + Debug + Default + Eq + TypeInfo;
/// The type used to store the intermediate values between pre- and post-dispatch.
diff --git a/substrate/frame/transaction-payment/src/payment.rs b/substrate/frame/transaction-payment/src/payment.rs
index ebc9c5c5afd..bc871deafdc 100644
--- a/substrate/frame/transaction-payment/src/payment.rs
+++ b/substrate/frame/transaction-payment/src/payment.rs
@@ -1,15 +1,11 @@
/// ! Traits and default implementation for paying transaction fees.
use crate::Config;
-use codec::FullCodec;
use sp_runtime::{
- traits::{
- AtLeast32BitUnsigned, DispatchInfoOf, MaybeSerializeDeserialize, PostDispatchInfoOf,
- Saturating, Zero,
- },
+ traits::{DispatchInfoOf, PostDispatchInfoOf, Saturating, Zero},
transaction_validity::InvalidTransaction,
};
-use sp_std::{fmt::Debug, marker::PhantomData};
+use sp_std::marker::PhantomData;
use frame_support::{
traits::{Currency, ExistenceRequirement, Imbalance, OnUnbalanced, WithdrawReasons},
@@ -22,13 +18,8 @@ type NegativeImbalanceOf<C, T> =
/// Handle withdrawing, refunding and depositing of transaction fees.
pub trait OnChargeTransaction<T: Config> {
/// The underlying integer type in which fees are calculated.
- type Balance: AtLeast32BitUnsigned
- + FullCodec
- + Copy
- + MaybeSerializeDeserialize
- + Debug
- + Default
- + scale_info::TypeInfo;
+ type Balance: frame_support::traits::tokens::Balance;
+
type LiquidityInfo: Default;
/// Before the transaction is executed the payment of the transaction fees
--
GitLab