Build fixes

frame/identity/src/lib.rs

@@ -890,7 +890,7 @@ impl<T: Trait> Module<T> {
 impl<T: Trait> MigrateAccount<T::AccountId> for Module<T> {
 	fn migrate_account(a: &T::AccountId) {
 		if IdentityOf::<T>::migrate_key_from_blake(a).is_some() {
-			if let Some(subs) = SubsOf::<T>::migrate_key_from_blake(a) {
+			if let Some((_, subs)) = SubsOf::<T>::migrate_key_from_blake(a) {
 				for sub in subs.into_iter() {
 					SuperOf::<T>::migrate_key_from_blake(sub);
 				}

frame/session/src/lib.rs

@@ -509,9 +509,12 @@ decl_module! {
 
 impl<T: Trait> MigrateAccount<T::AccountId> for Module<T> {
 	fn migrate_account(a: &T::AccountId) {
-		if let Some(keys) = NextKeys::<T>::migrate_key_from_blake(a) {
-			for id in T::Keys::key_ids() {
-				KeyOwner::<T>::migrate_key_from_blake((*id, keys.get_raw(*id)));
+		use codec::Encode;
+		if let Ok(v) = a.using_encoded(|mut d| T::ValidatorId::decode(&mut d)) {
+			if let Some(keys) = NextKeys::<T>::migrate_key_from_blake(v) {
+				for id in T::Keys::key_ids() {
+					KeyOwner::<T>::migrate_key_from_blake((*id, keys.get_raw(*id)));
+				}
 			}
 		}
 	}

frame/system/src/migration.rs

@@ -21,12 +21,21 @@ pub fn migrate<T: Trait>() {
 	}
 
 	sp_runtime::print("Migrating Accounts...");
-	let accounts = include!("accountids.rs");
+//	let accounts = include!("accountids.rs");
+	let accounts = [
+		hex!["86b7409a11700afb027924cb40fa43889d98709ea35319d48fea85dd35004e64"],
+		hex!["bef3f1aa71b32bba775b3886b900a2e3fb4f4163d58c1bce0aaecfe0b55c1b5f"],
+	];
+	let mut count = 0u32;
 	for a in accounts.iter().filter_map(|a| T::AccountId::decode(&mut &a[..]).ok()) {
 		if Account::<T>::migrate_key_from_blake(&a).is_some() {
-			a.using_encoded(|a| sp_runtime::print(a));
 			// Inform other modules about the account.
 			T::MigrateAccount::migrate_account(&a);
+			count += 1;
+			if count % 1000 == 0 {
+				sp_runtime::print(count);
+			}
 		}
 	}
+	sp_runtime::print(count);
 }