Clean up OnReapAccount

paritytech · gnunicorn · Feb 24, 2020 · Feb 15, 2020 · Feb 15, 2020 · Feb 18, 2020
commit 2d8f05e612a3f5e2b72f5996fccfa9c749140455
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
@@ -164,7 +164,7 @@ impl system::Trait for Runtime {
 	/// What to do if a new account is created.
 	type OnNewAccount = ();
 	/// What to do if an account is fully reaped from the system.
-	type OnReapAccount = Balances;
+	type OnReapAccount = ();
 	/// The data to be stored in an account.
 	type AccountData = balances::AccountData<Balance>;
 }

@@ -117,7 +117,7 @@ impl frame_system::Trait for Test {
 	type ModuleToIndex = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
-	type OnReapAccount = (Balances, Contracts);
+	type OnReapAccount = Contracts;
 }
 impl pallet_balances::Trait for Test {
 	type Balance = u64;

diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
@@ -1300,7 +1300,7 @@ mod tests {
 		type ModuleToIndex = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
-		type OnReapAccount = Balances;
+		type OnReapAccount = ();
 	}
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;

diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
@@ -816,7 +816,7 @@ mod tests {
 		type ModuleToIndex = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
-		type OnReapAccount = Balances;
+		type OnReapAccount = ();
 	}
 
 	parameter_types! {

diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
@@ -56,7 +56,7 @@ impl frame_system::Trait for Test {
 	type ModuleToIndex = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
-	type OnReapAccount = Balances;
+	type OnReapAccount = ();
 }
 
 parameter_types! {

diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
@@ -690,7 +690,7 @@ mod tests {
 		type ModuleToIndex = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
-		type OnReapAccount = pallet_balances::Module<Test>;
+		type OnReapAccount = ();
 	}
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;

diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
@@ -469,7 +469,7 @@ mod tests {
 		type ModuleToIndex = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
-		type OnReapAccount = Balances;
+		type OnReapAccount = ();
 	}
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;

diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
@@ -926,7 +926,7 @@ mod tests {
 		type ModuleToIndex = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
-		type OnReapAccount = Balances;
+		type OnReapAccount = ();
 	}
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;

diff --git a/frame/indices/src/mock.rs b/frame/indices/src/mock.rs
@@ -67,7 +67,7 @@ impl frame_system::Trait for Test {
 	type ModuleToIndex = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
-	type OnReapAccount = Balances;
+	type OnReapAccount = ();
 }
 
 parameter_types! {

diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
@@ -287,7 +287,7 @@ mod tests {
 		type ModuleToIndex = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
-		type OnReapAccount = Balances;
+		type OnReapAccount = ();
 	}
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;

diff --git a/frame/recovery/src/mock.rs b/frame/recovery/src/mock.rs
@@ -80,7 +80,7 @@ impl frame_system::Trait for Test {
 	type ModuleToIndex = ();
 	type AccountData = pallet_balances::AccountData<u128>;
 	type OnNewAccount = ();
-	type OnReapAccount = Balances;
+	type OnReapAccount = ();
 }
 
 parameter_types! {

diff --git a/frame/scored-pool/src/mock.rs b/frame/scored-pool/src/mock.rs
@@ -72,7 +72,7 @@ impl frame_system::Trait for Test {
 	type ModuleToIndex = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
-	type OnReapAccount = Balances;
+	type OnReapAccount = ();
 }
 
 impl pallet_balances::Trait for Test {

diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
@@ -78,7 +78,7 @@ impl frame_system::Trait for Test {
 	type Version = ();
 	type ModuleToIndex = ();
 	type OnNewAccount = ();
-	type OnReapAccount = Balances;
+	type OnReapAccount = ();
 	type AccountData = pallet_balances::AccountData<u64>;
 }
 

diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
@@ -304,7 +304,7 @@ mod tests {
 		type ModuleToIndex = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
-		type OnReapAccount = Balances;
+		type OnReapAccount = ();
 	}
 
 	parameter_types! {

diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
@@ -760,7 +760,7 @@ mod tests {
 		type ModuleToIndex = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
-		type OnReapAccount = Balances;
+		type OnReapAccount = ();
 	}
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;

diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
@@ -624,7 +624,7 @@ mod tests {
 		type ModuleToIndex = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
-		type OnReapAccount = Balances;
+		type OnReapAccount = ();
 	}
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;

diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
@@ -339,7 +339,7 @@ mod tests {
 		type ModuleToIndex = ();
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
-		type OnReapAccount = Balances;
+		type OnReapAccount = ();
 	}
 	impl pallet_balances::Trait for Test {
 		type Balance = u64;