update refund trait

paritytech · Apr 15, 2024 · 290c0f1 · 290c0f1
1 parent ab196b6
commit 290c0f1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 20 deletions.
diff --git a/substrate/frame/assets/src/impl_fungibles.rs b/substrate/frame/assets/src/impl_fungibles.rs
@@ -310,8 +310,6 @@ impl<T: Config<I>, I: 'static> fungibles::InspectEnumerable<T::AccountId> for Pa
 }
 
 impl<T: Config<I>, I: 'static> fungibles::Refund<T::AccountId> for Pallet<T, I> {
-	type AssetId = T::AssetId;
-	type Balance = DepositBalanceOf<T, I>;
 	fn deposit_held(id: Self::AssetId, who: T::AccountId) -> Option<(T::AccountId, Self::Balance)> {
 		use ExistenceReason::*;
 		match Account::<T, I>::get(&id, &who).ok_or(Error::<T, I>::NoDeposit).ok()?.reason {

diff --git a/substrate/frame/assets/src/lib.rs b/substrate/frame/assets/src/lib.rs
@@ -305,7 +305,7 @@ pub mod pallet {
 
 		/// The currency mechanism.
 		#[pallet::no_default]
-		type Currency: ReservableCurrency<Self::AccountId>;
+		type Currency: ReservableCurrency<Self::AccountId, Balance = Self::Balance>;
 
 		/// Standard asset class creation is only allowed if the origin attempting it and the
 		/// asset class are in this set.

diff --git a/substrate/frame/support/src/traits/tokens/fungible/union_of.rs b/substrate/frame/support/src/traits/tokens/fungible/union_of.rs
@@ -928,15 +928,12 @@ impl<
 
 impl<
 		Left: fungible::Inspect<AccountId>,
-		Right: fungibles::Inspect<AccountId> + fungibles::Refund<AccountId>,
-		Criterion: Convert<AssetKind, Either<(), <Right as fungibles::Refund<AccountId>>::AssetId>>,
+		Right: fungibles::Inspect<AccountId, Balance = Left::Balance> + fungibles::Refund<AccountId>,
+		Criterion: Convert<AssetKind, Either<(), <Right as fungibles::Inspect<AccountId>>::AssetId>>,
 		AssetKind: AssetId,
 		AccountId,
 	> fungibles::Refund<AccountId> for UnionOf<Left, Right, Criterion, AssetKind, AccountId>
 {
-	type AssetId = AssetKind;
-	type Balance = <Right as fungibles::Refund<AccountId>>::Balance;
-
 	fn deposit_held(asset: AssetKind, who: AccountId) -> Option<(AccountId, Self::Balance)> {
 		match Criterion::convert(asset) {
 			Left(()) => None,

diff --git a/substrate/frame/support/src/traits/tokens/fungibles/lifetime.rs b/substrate/frame/support/src/traits/tokens/fungibles/lifetime.rs
@@ -35,11 +35,7 @@ pub trait Create<AccountId>: Inspect<AccountId> {
 }
 
 /// Trait for refunding the deposit of a target asset account.
-pub trait Refund<AccountId> {
-	/// Means of identifying one asset class from another.
-	type AssetId: AssetId;
-	/// Scalar type for representing balance of an account.
-	type Balance: Balance;
+pub trait Refund<AccountId>: Inspect<AccountId> {
 	/// Returns the amount of account deposit and depositor address, if any.
 	fn deposit_held(id: Self::AssetId, who: AccountId) -> Option<(AccountId, Self::Balance)>;
 	/// Return the deposit (if any) of a target asset account.

diff --git a/substrate/frame/support/src/traits/tokens/fungibles/union_of.rs b/substrate/frame/support/src/traits/tokens/fungibles/union_of.rs
@@ -907,22 +907,18 @@ impl<
 
 impl<
 		Left: fungibles::Inspect<AccountId> + fungibles::Refund<AccountId>,
-		Right: fungibles::Inspect<AccountId>
-			+ fungibles::Refund<AccountId, Balance = <Left as fungibles::Refund<AccountId>>::Balance>,
+		Right: fungibles::Inspect<AccountId, Balance = Left::Balance> + fungibles::Refund<AccountId>,
 		Criterion: Convert<
 			AssetKind,
 			Either<
-				<Left as fungibles::Refund<AccountId>>::AssetId,
-				<Right as fungibles::Refund<AccountId>>::AssetId,
+				<Left as fungibles::Inspect<AccountId>>::AssetId,
+				<Right as fungibles::Inspect<AccountId>>::AssetId,
 			>,
 		>,
 		AssetKind: AssetId,
 		AccountId,
 	> fungibles::Refund<AccountId> for UnionOf<Left, Right, Criterion, AssetKind, AccountId>
 {
-	type AssetId = AssetKind;
-	type Balance = <Left as fungibles::Refund<AccountId>>::Balance;
-
 	fn deposit_held(asset: AssetKind, who: AccountId) -> Option<(AccountId, Self::Balance)> {
 		match Criterion::convert(asset) {
 			Left(a) => <Left as fungibles::Refund<AccountId>>::deposit_held(a, who),