cherry-pick paritytech#5226 (dd97b14)

massage the code and fix anything failing compilation
hicommonwealth · Jun 17, 2020 · 81915a6 · 81915a6
1 parent 843facf
commit 81915a6
Show file tree

Hide file tree

Showing 64 changed files with 462 additions and 48 deletions.
diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
@@ -45,7 +45,7 @@ impl system::Trait for Test {
 	type Version = ();
 	type ModuleToIndex = ();
 	type AccountData = ();
-	type OnNewAccount = ();
+	type MigrateAccount = (); type OnNewAccount = ();
 	type OnKilledAccount = ();
 }
 impl Trait for Test {

diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
@@ -182,7 +182,7 @@ impl system::Trait for Runtime {
 	/// This type is being generated by `construct_runtime!`.
 	type ModuleToIndex = ModuleToIndex;
 	/// What to do if a new account is created.
-	type OnNewAccount = ();
+	type MigrateAccount = (); type OnNewAccount = ();
 	/// What to do if an account is fully reaped from the system.
 	type OnKilledAccount = ();
 	/// The data to be stored in an account.

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
@@ -164,6 +164,7 @@ impl frame_system::Trait for Runtime {
 	type Version = Version;
 	type ModuleToIndex = ModuleToIndex;
 	type AccountData = pallet_balances::AccountData<Balance>;
+	type MigrateAccount = (Balances, Identity, Democracy, Elections, ImOnline, Recovery, Session, Society, Staking, Vesting);
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 }

diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
@@ -325,7 +325,7 @@ mod tests {
 		type Version = ();
 		type ModuleToIndex = ();
 		type AccountData = ();
-		type OnNewAccount = ();
+		type MigrateAccount = (); type OnNewAccount = ();
 		type OnKilledAccount = ();
 	}
 	impl Trait for Test {

diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
@@ -67,7 +67,7 @@ impl frame_system::Trait for Test {
 	type Version = ();
 	type ModuleToIndex = ();
 	type AccountData = ();
-	type OnNewAccount = ();
+	type MigrateAccount = (); type OnNewAccount = ();
 	type OnKilledAccount = ();
 }
 

diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
@@ -164,7 +164,7 @@ mod tests {
 		type Version = ();
 		type ModuleToIndex = ();
 		type AccountData = ();
-		type OnNewAccount = ();
+		type MigrateAccount = (); type OnNewAccount = ();
 		type OnKilledAccount = ();
 	}
 

diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
@@ -439,7 +439,7 @@ mod tests {
 		type Version = ();
 		type ModuleToIndex = ();
 		type AccountData = ();
-		type OnNewAccount = ();
+		type MigrateAccount = (); type OnNewAccount = ();
 		type OnKilledAccount = ();
 	}
 

diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
@@ -208,6 +208,14 @@ decl_module! {
 			// remove temporary "environment" entry from storage
 			Lateness::<T>::kill();
 		}
+
+		fn on_runtime_upgrade() -> Weight {
+			for i in 0..=SegmentIndex::get() {
+				UnderConstruction::migrate_key_from_blake(i);
+			}
+			// TODO: determine weight
+			0
+		}
 	}
 }
 

diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
@@ -78,7 +78,7 @@ impl frame_system::Trait for Test {
 	type MaximumBlockLength = MaximumBlockLength;
 	type ModuleToIndex = ();
 	type AccountData = ();
-	type OnNewAccount = ();
+	type MigrateAccount = (); type OnNewAccount = ();
 	type OnKilledAccount = ();
 }
 

diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
@@ -165,7 +165,7 @@ use frame_support::{
 		Currency, OnKilledAccount, OnUnbalanced, TryDrop, StoredMap,
 		WithdrawReason, WithdrawReasons, LockIdentifier, LockableCurrency, ExistenceRequirement,
 		Imbalance, SignedImbalance, ReservableCurrency, Get, ExistenceRequirement::KeepAlive,
-		ExistenceRequirement::AllowDeath, IsDeadAccount, BalanceStatus as Status,
+		ExistenceRequirement::AllowDeath, IsDeadAccount, BalanceStatus as Status, MigrateAccount
 	},
 	weights::Weight,
 };
@@ -569,6 +569,12 @@ impl<Balance, BlockNumber> OldBalanceLock<Balance, BlockNumber> {
 	}
 }
 
+impl<T: Trait<I>, I: Instance> MigrateAccount<T::AccountId> for Module<T, I> {
+	fn migrate_account(account: &T::AccountId) {
+		Locks::<T, I>::migrate_key_from_blake(account);
+	}
+}
+
 impl<T: Trait<I>, I: Instance> Module<T, I> {
 	// PRIVATE MUTABLES
 
@@ -892,7 +898,7 @@ impl<T: Subtrait<I>, I: Instance> frame_system::Trait for ElevatedTrait<T, I> {
 	type AvailableBlockRatio = T::AvailableBlockRatio;
 	type Version = T::Version;
 	type ModuleToIndex = T::ModuleToIndex;
-	type OnNewAccount = T::OnNewAccount;
+	type MigrateAccount = (); type OnNewAccount = T::OnNewAccount;
 	type OnKilledAccount = T::OnKilledAccount;
 	type AccountData = T::AccountData;
 }

diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
@@ -77,7 +77,7 @@ impl frame_system::Trait for Test {
 	type Version = ();
 	type ModuleToIndex = ();
 	type AccountData = super::AccountData<u64>;
-	type OnNewAccount = ();
+	type MigrateAccount = (); type OnNewAccount = ();
 	type OnKilledAccount = ();
 }
 parameter_types! {

diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
@@ -77,7 +77,7 @@ impl frame_system::Trait for Test {
 	type Version = ();
 	type ModuleToIndex = ();
 	type AccountData = super::AccountData<u64>;
-	type OnNewAccount = ();
+	type MigrateAccount = (); type OnNewAccount = ();
 	type OnKilledAccount = Module<Test>;
 }
 parameter_types! {

diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
@@ -88,7 +88,7 @@ impl frame_system::Trait for Test {
 	type Version = ();
 	type ModuleToIndex = ();
 	type AccountData = ();
-	type OnNewAccount = ();
+	type MigrateAccount = (); type OnNewAccount = ();
 	type OnKilledAccount = ();
 }
 

diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
@@ -334,6 +334,16 @@ fn get_result_weight(result: DispatchResultWithPostInfo) -> Option<Weight> {
 	}
 }
 
+mod migration {
+	use super::*;
+
+	pub fn migrate<T: Trait<I>, I: Instance>() {
+		for p in Proposals::<T, I>::get().into_iter() {
+			ProposalOf::<T, I>::migrate_key_from_blake(&p);
+			Voting::<T, I>::migrate_key_from_blake(&p);
+		}
+	}
+}
 
 // Note that councillor operations are assigned to the operational class.
 decl_module! {
@@ -342,6 +352,12 @@ decl_module! {
 
 		fn deposit_event() = default;
 
+		fn on_runtime_upgrade() -> Weight {
+			migration::migrate::<T, I>();
+			// TODO: determine actual weight
+			0
+		}
+
 		/// Set the collective's membership.
 		///
 		/// - `new_members`: The new member list. Be nice to the chain and provide it sorted.
@@ -990,7 +1006,7 @@ mod tests {
 		type Version = ();
 		type ModuleToIndex = ();
 		type AccountData = ();
-		type OnNewAccount = ();
+		type MigrateAccount = (); type OnNewAccount = ();
 		type OnKilledAccount = ();
 	}
 	impl Trait<Instance1> for Test {

diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
@@ -103,6 +103,7 @@ impl frame_system::Trait for Test {
 	type Version = ();
 	type ModuleToIndex = ();
 	type AccountData = pallet_balances::AccountData<u64>;
+	type MigrateAccount = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 }

diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
@@ -178,7 +178,7 @@ use frame_support::{
 	weights::{Weight, DispatchClass},
 	traits::{
 		Currency, ReservableCurrency, LockableCurrency, WithdrawReason, LockIdentifier, Get,
-		OnUnbalanced, BalanceStatus, schedule::Named as ScheduleNamed, EnsureOrigin
+		OnUnbalanced, BalanceStatus, schedule::Named as ScheduleNamed, EnsureOrigin, MigrateAccount,
 	},
 	dispatch::DispatchResultWithPostInfo,
 };
@@ -623,6 +623,99 @@ mod weight_for {
 	}
 }
 
+impl<T: Trait> MigrateAccount<T::AccountId> for Module<T> {
+	fn migrate_account(a: &T::AccountId) {
+		mod deprecated {
+			use sp_std::prelude::*;
+
+			use codec::{Encode, EncodeLike, Decode, Input, Output};
+			use frame_support::{decl_module, decl_storage};
+			use sp_runtime::RuntimeDebug;
+			use sp_std::convert::TryFrom;
+
+			use crate::{Trait, ReferendumIndex, Conviction};
+
+			#[derive(Copy, Clone, Eq, PartialEq, Default, RuntimeDebug)]
+			pub struct Vote {
+				pub aye: bool,
+				pub conviction: Conviction,
+			}
+
+			impl Encode for Vote {
+				fn encode_to<T: Output>(&self, output: &mut T) {
+					output.push_byte(u8::from(self.conviction) | if self.aye { 0b1000_0000 } else { 0 });
+				}
+			}
+
+			impl EncodeLike for Vote {}
+
+			impl Decode for Vote {
+				fn decode<I: Input>(input: &mut I) -> core::result::Result<Self, codec::Error> {
+					let b = input.read_byte()?;
+					Ok(Vote {
+						aye: (b & 0b1000_0000) == 0b1000_0000,
+						conviction: Conviction::try_from(b & 0b0111_1111)
+							.map_err(|_| codec::Error::from("Invalid conviction"))?,
+					})
+				}
+			}
+
+			decl_module! {
+				pub struct Module<T: Trait> for enum Call where origin: T::Origin { }
+			}
+			decl_storage! {
+				trait Store for Module<T: Trait> as Democracy {
+					pub VoteOf get(fn vote_of):
+						map hasher(opaque_blake2_256) (ReferendumIndex, T::AccountId) => Vote;
+					pub Delegations get(fn delegations):
+						map hasher(opaque_blake2_256) T::AccountId => (T::AccountId, Conviction);
+				}
+			}
+		}
+
+		Proxy::<T>::migrate_key_from_blake(a);
+		Locks::<T>::migrate_key_from_blake(a);
+		// TODO: will not actually do any useful migration
+		deprecated::Delegations::<T>::migrate_key_from_blake(a);
+		for i in LowestUnbaked::get()..ReferendumCount::get() {
+			// TODO: will not actually do any useful migration
+			deprecated::VoteOf::<T>::migrate_key_from_blake((i, a));
+		}
+	}
+}
+
+mod migration {
+	use super::*;
+
+	pub fn migrate<T: Trait>() {
+		mod deprecated {
+			use super::*;
+
+			decl_module! {
+				pub struct Module<T: Trait> for enum Call where origin: T::Origin { }
+			}
+			decl_storage! {
+				trait Store for Module<T: Trait> as Democracy {
+					pub VotersFor get(fn voters_for):
+						map hasher(opaque_blake2_256) ReferendumIndex => Vec<T::AccountId>;
+				}
+			}
+		}
+
+		Blacklist::<T>::remove_all();
+		Cancellations::<T>::remove_all();
+		for i in LowestUnbaked::get()..ReferendumCount::get() {
+			// TODO: will not actually do any useful migration
+			deprecated::VotersFor::<T>::migrate_key_from_blake(i);
+			ReferendumInfoOf::<T>::migrate_key_from_blake(i);
+		}
+		for (p, h, _) in PublicProps::<T>::get().into_iter() {
+			DepositOf::<T>::migrate_key_from_blake(p);
+			Preimages::<T>::migrate_key_from_blake(h);
+		}
+	}
+}
+
 decl_module! {
 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
@@ -658,6 +751,9 @@ decl_module! {
 		fn deposit_event() = default;
 
 		fn on_runtime_upgrade() -> Weight {
+			// TODO: determine correct weight
+			migration::migrate::<T>();
+
 			if let None = StorageVersion::get() {
 				StorageVersion::put(Releases::V1);
 

diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
@@ -106,6 +106,7 @@ impl frame_system::Trait for Test {
 	type Version = ();
 	type ModuleToIndex = ();
 	type AccountData = pallet_balances::AccountData<u64>;
+	type MigrateAccount = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
 }

diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
@@ -102,6 +102,7 @@ use frame_support::{
 };
 use sp_phragmen::{build_support_map, ExtendedBalance, VoteWeight, PhragmenResult};
 use frame_system::{self as system, ensure_signed, ensure_root};
+use frame_support::traits::MigrateAccount;
 
 mod benchmarking;
 
@@ -694,6 +695,31 @@ decl_event!(
 	}
 );
 
+impl<T: Trait> MigrateAccount<T::AccountId> for Module<T> {
+	fn migrate_account(a: &T::AccountId) {
+		mod deprecated {
+			use super::*;
+
+			decl_module! {
+				pub struct Module<T: Trait> for enum Call where origin: T::Origin { }
+			}
+			decl_storage! {
+				trait Store for Module<T: Trait> as PhragmenElection {
+					pub VotesOf get(fn votes_of):
+						map hasher(opaque_blake2_256) T::AccountId => Vec<T::AccountId>;
+					pub StakeOf get(fn stake_of):
+						map hasher(opaque_blake2_256) T::AccountId => BalanceOf<T>;
+				}
+			}
+		}
+
+		// TODO: will not actually do any useful migration
+		if deprecated::StakeOf::<T>::migrate_key_from_blake(a).is_some() {
+			deprecated::VotesOf::<T>::migrate_key_from_blake(a);
+		}
+	}
+}
+
 impl<T: Trait> Module<T> {
 	/// Attempts to remove a member `who`. If a runner-up exists, it is used as the replacement and
 	/// Ok(true). is returned.
@@ -1095,7 +1121,7 @@ mod tests {
 		type Version = ();
 		type ModuleToIndex = ();
 		type AccountData = pallet_balances::AccountData<u64>;
-		type OnNewAccount = ();
+		type MigrateAccount = (); type OnNewAccount = ();
 		type OnKilledAccount = ();
 	}
 

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

diff --git a/frame/example-offchain-worker/src/tests.rs b/frame/example-offchain-worker/src/tests.rs
@@ -75,7 +75,7 @@ impl frame_system::Trait for Test {
 	type Version = ();
 	type ModuleToIndex = ();
 	type AccountData = ();
-	type OnNewAccount = ();
+	type MigrateAccount = (); type OnNewAccount = ();
 	type OnKilledAccount = ();
 }
 

diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
@@ -760,7 +760,7 @@ mod tests {
 		type Version = ();
 		type ModuleToIndex = ();
 		type AccountData = pallet_balances::AccountData<u64>;
-		type OnNewAccount = ();
+		type MigrateAccount = (); type OnNewAccount = ();
 		type OnKilledAccount = ();
 	}
 	parameter_types! {