remove sweep_dust (#615)

Author: ermalkaleci

currencies/src/mock.rs

@@ -3,7 +3,7 @@
 #![cfg(test)]
 
 use super::*;
-use frame_support::{construct_runtime, ord_parameter_types, parameter_types, PalletId};
+use frame_support::{construct_runtime, parameter_types, PalletId};
 use orml_traits::parameter_type_with_key;
 use sp_core::H256;
 use sp_runtime::{
@@ -75,16 +75,11 @@ parameter_types! {
 	pub MaxLocks: u32 = 100_000;
 }
 
-ord_parameter_types! {
-	pub const Admin: AccountId = ALICE;
-}
-
 impl orml_tokens::Config for Runtime {
 	type Event = Event;
 	type Balance = Balance;
 	type Amount = i64;
 	type CurrencyId = CurrencyId;
-	type SweepOrigin = frame_system::EnsureSignedBy<Admin, AccountId>;
 	type WeightInfo = ();
 	type ExistentialDeposits = ExistentialDeposits;
 	type OnDust = orml_tokens::TransferDust<Runtime, DustAccount>;

tokens/src/lib.rs

@@ -189,9 +189,6 @@ pub mod module {
 		/// The currency ID type
 		type CurrencyId: Parameter + Member + Copy + MaybeSerializeDeserialize + Ord;
 
-		/// The AccountId that can perform a sweep dust.
-		type SweepOrigin: EnsureOrigin<Self::Origin>;
-
 		/// Weight information for extrinsics in this module.
 		type WeightInfo: WeightInfo;
 
@@ -512,29 +509,6 @@ pub mod module {
 				Ok(())
 			})
 		}
-
-		#[pallet::weight(T::WeightInfo::sweep_dust(accounts.len() as u32))]
-		pub fn sweep_dust(
-			origin: OriginFor<T>,
-			currency_id: T::CurrencyId,
-			accounts: Vec<T::AccountId>,
-		) -> DispatchResult {
-			T::SweepOrigin::ensure_origin(origin)?;
-			for account in accounts {
-				let account_data = Accounts::<T>::get(&account, &currency_id);
-				if account_data.free.is_zero() {
-					continue;
-				}
-				if !account_data.reserved.is_zero() {
-					continue;
-				}
-				if account_data.free < T::ExistentialDeposits::get(&currency_id) {
-					T::OnDust::on_dust(&account, currency_id, account_data.free);
-					Self::deposit_event(Event::DustLost(currency_id, account, account_data.free));
-				}
-			}
-			Ok(())
-		}
 	}
 }
 

tokens/src/mock.rs

@@ -4,7 +4,7 @@
 
 use super::*;
 use frame_support::{
-	construct_runtime, ord_parameter_types, parameter_types,
+	construct_runtime, parameter_types,
 	traits::{ChangeMembers, ContainsLengthBound, GenesisBuild, SaturatingCurrencyToVote, SortedMembers},
 	PalletId,
 };
@@ -226,16 +226,11 @@ parameter_types! {
 	pub MaxLocks: u32 = 2;
 }
 
-ord_parameter_types! {
-	pub const Admin: AccountId = ALICE;
-}
-
 impl Config for Runtime {
 	type Event = Event;
 	type Balance = Balance;
 	type Amount = i64;
 	type CurrencyId = CurrencyId;
-	type SweepOrigin = frame_system::EnsureSignedBy<Admin, AccountId>;
 	type WeightInfo = ();
 	type ExistentialDeposits = ExistentialDeposits;
 	type OnDust = TransferDust<Runtime, DustReceiver>;

tokens/src/tests.rs

@@ -2079,64 +2079,3 @@ fn fungibles_mutate_hold_trait_should_work() {
 			);
 		});
 }
-
-#[test]
-fn sweep_dust_works() {
-	ExtBuilder::default().build().execute_with(|| {
-		Accounts::<Runtime>::insert(
-			BOB,
-			DOT,
-			AccountData {
-				free: 1,
-				frozen: 0,
-				reserved: 0,
-			},
-		);
-		Accounts::<Runtime>::insert(
-			CHARLIE,
-			DOT,
-			AccountData {
-				free: 2,
-				frozen: 0,
-				reserved: 0,
-			},
-		);
-		Accounts::<Runtime>::insert(
-			DAVE,
-			DOT,
-			AccountData {
-				free: 0,
-				frozen: 1,
-				reserved: 0,
-			},
-		);
-		TotalIssuance::<Runtime>::insert(DOT, 3);
-
-		let accounts = vec![BOB, CHARLIE, DAVE];
-
-		// cannot be called by root or anyone expect SweepOrigin
-		assert_noop!(
-			Tokens::sweep_dust(Origin::root(), DOT, accounts.clone()),
-			DispatchError::BadOrigin
-		);
-		assert_noop!(
-			Tokens::sweep_dust(Origin::signed(BOB), DOT, accounts.clone()),
-			DispatchError::BadOrigin
-		);
-
-		assert_ok!(Tokens::sweep_dust(Origin::signed(ALICE), DOT, accounts.clone()));
-		System::assert_last_event(Event::Tokens(crate::Event::DustLost(DOT, BOB, 1)));
-
-		// Bob's account is gone
-		assert_eq!(Accounts::<Runtime>::contains_key(BOB, DOT), false);
-		assert_eq!(Tokens::free_balance(DOT, &BOB), 0);
-
-		// Charlie's account remains, not below ED
-		assert_eq!(Tokens::free_balance(DOT, &CHARLIE), 2);
-
-		// Dust transferred to dust receiver
-		assert_eq!(Tokens::free_balance(DOT, &DustReceiver::get()), 1);
-		// Total issuance remains the same
-		assert_eq!(Tokens::total_issuance(DOT), 3);
-	});
-}

tokens/src/weights.rs

@@ -34,7 +34,6 @@ pub trait WeightInfo {
 	fn transfer_keep_alive() -> Weight;
 	fn force_transfer() -> Weight;
 	fn set_balance() -> Weight;
-	fn sweep_dust(c: u32, ) -> Weight;
 }
 
 /// Default weights.
@@ -64,13 +63,4 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
-	fn sweep_dust(c: u32, ) -> Weight {
-		(3_100_000 as Weight)
-			// Standard Error: 597_000
-			.saturating_add((27_100_000 as Weight).saturating_mul(c as Weight))
-			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(c as Weight)))
-	}
 }

xtokens/src/mock/para.rs

@@ -2,7 +2,7 @@ use super::{Amount, Balance, CurrencyId, CurrencyIdConvert, ParachainXcmRouter,
 use crate as orml_xtokens;
 
 use frame_support::{
-	construct_runtime, ord_parameter_types, parameter_types,
+	construct_runtime, parameter_types,
 	traits::{Everything, Get},
 	weights::{constants::WEIGHT_PER_SECOND, Weight},
 };
@@ -90,16 +90,11 @@ parameter_type_with_key! {
 	};
 }
 
-ord_parameter_types! {
-	pub const Admin: AccountId = ALICE;
-}
-
 impl orml_tokens::Config for Runtime {
 	type Event = Event;
 	type Balance = Balance;
 	type Amount = Amount;
 	type CurrencyId = CurrencyId;
-	type SweepOrigin = frame_system::EnsureSignedBy<Admin, AccountId>;
 	type WeightInfo = ();
 	type ExistentialDeposits = ExistentialDeposits;
 	type OnDust = ();