From 1a65205278c2c69452df8c6d1dcc21f86e32c7e7 Mon Sep 17 00:00:00 2001
From: Alexander Popiak <alexander.popiak@parity.io>
Date: Fri, 25 Sep 2020 11:11:48 +0200
Subject: [PATCH] Move proxies migration (#7205)

* move the time delayed proxies migration into a separate function

* add use statement

* Update frame/proxy/src/lib.rs

* bump proxy cargo version

* update Cargo.lock

* Update lib.rs

* better format

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Gav Wood <gavin@parity.io>
---
 substrate/Cargo.lock             |  2 +-
 substrate/frame/proxy/Cargo.toml |  2 +-
 substrate/frame/proxy/src/lib.rs | 45 ++++++++++++++++++++------------
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index 1bf8b6a11f..b34eee2154 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -4713,7 +4713,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-proxy"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
diff --git a/substrate/frame/proxy/Cargo.toml b/substrate/frame/proxy/Cargo.toml
index 1c32edf162..219e72502e 100644
--- a/substrate/frame/proxy/Cargo.toml
+++ b/substrate/frame/proxy/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-proxy"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/substrate/frame/proxy/src/lib.rs b/substrate/frame/proxy/src/lib.rs
index 4746a4ab67..98d6ef47d3 100644
--- a/substrate/frame/proxy/src/lib.rs
+++ b/substrate/frame/proxy/src/lib.rs
@@ -226,22 +226,6 @@ decl_module! {
 		/// `AnnouncementDepositFactor` metadata shadow.
 		const AnnouncementDepositFactor: BalanceOf<T> = T::AnnouncementDepositFactor::get();
 
-		fn on_runtime_upgrade() -> Weight {
-			Proxies::<T>::translate::<(Vec<(T::AccountId, T::ProxyType)>, BalanceOf<T>), _>(
-				|_, (targets, deposit)| Some((
-					targets.into_iter()
-						.map(|(a, t)| ProxyDefinition {
-							delegate: a,
-							proxy_type: t,
-							delay: Zero::zero(),
-						})
-						.collect::<Vec<_>>(),
-					deposit,
-				))
-			);
-			T::MaximumBlockWeight::get()
-		}
-
 		/// Dispatch the given `call` from an account that the sender is authorised for through
 		/// `add_proxy`.
 		///
@@ -675,3 +659,32 @@ impl<T: Trait> Module<T> {
 		Self::deposit_event(RawEvent::ProxyExecuted(e.map(|_| ()).map_err(|e| e.error)));
 	}
 }
+
+/// Migration utilities for upgrading the Proxy pallet between its different versions.
+pub mod migration {
+	use super::*;
+
+	/// Migration code for https://github.com/paritytech/substrate/pull/6770
+	///
+	/// Details: This migration was introduced between Substrate 2.0-RC6 and Substrate 2.0 releases.
+	/// Before this migration, the `Proxies` storage item used a tuple of `AccountId` and
+	/// `ProxyType` to represent the proxy definition. After #6770, we switched to use a struct
+	/// `ProxyDefinition` which additionally included a `BlockNumber` delay value. This function,
+	/// simply takes any existing proxies using the old tuple format, and migrates it to the new
+	/// struct by setting the delay to zero.
+	pub fn migrate_to_time_delayed_proxies<T: Trait>() -> Weight {
+		Proxies::<T>::translate::<(Vec<(T::AccountId, T::ProxyType)>, BalanceOf<T>), _>(
+			|_, (targets, deposit)| Some((
+				targets.into_iter()
+					.map(|(a, t)| ProxyDefinition {
+						delegate: a,
+						proxy_type: t,
+						delay: Zero::zero(),
+					})
+					.collect::<Vec<_>>(),
+				deposit,
+			))
+		);
+		T::MaximumBlockWeight::get()
+	}
+}