identity: Don't let subs be re-registered (paritytech#6667)

* Fixes and tests * Don't set subs be re-registered. Also allow subs to de-register themselves and collect the deposit. Also allow individual registering and removal of subs. * Make it build * Update frame/identity/src/lib.rs Co-authored-by: joe petrowski <[email protected]> * Tests * Add benchmarks * Add some reasonable weights * Docs Co-authored-by: joe petrowski <[email protected]>
huitseeker · Jul 17, 2020 · 640dd1a · 640dd1a
1 parent 81e6a0c
commit 640dd1a
Show file tree

Hide file tree

Showing 24 changed files with 305 additions and 29 deletions.
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
@@ -287,7 +287,7 @@ mod tests {
 	use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 
 	impl_outer_origin! {
-		pub enum Origin for Test  where system = frame_system {}
+		pub enum Origin for Test where system = frame_system {}
 	}
 
 	#[derive(Clone, Eq, PartialEq)]

diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
@@ -30,7 +30,7 @@ use sp_io;
 use sp_core::H256;
 
 impl_outer_origin!{
-	pub enum Origin for Test  where system = frame_system {}
+	pub enum Origin for Test where system = frame_system {}
 }
 
 // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.

diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
@@ -172,7 +172,7 @@ mod tests {
 	}
 
 	impl_outer_origin! {
-		pub enum Origin for Test  where system = frame_system {}
+		pub enum Origin for Test where system = frame_system {}
 	}
 
 	pub struct TestSessionHandler;

diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
@@ -404,7 +404,7 @@ mod tests {
 	use frame_support::{parameter_types, impl_outer_origin, ConsensusEngineId, weights::Weight};
 
 	impl_outer_origin!{
-		pub enum Origin for Test  where system = frame_system {}
+		pub enum Origin for Test where system = frame_system {}
 	}
 
 	#[derive(Clone, Eq, PartialEq)]

diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
@@ -54,7 +54,7 @@ impl_outer_event! {
 	}
 }
 impl_outer_origin! {
-	pub enum Origin for Test  where system = frame_system { }
+	pub enum Origin for Test where system = frame_system { }
 }
 impl_outer_dispatch! {
 	pub enum Call for Test where origin: Origin {

diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
@@ -50,7 +50,7 @@ const BIG_AYE: Vote = Vote { aye: true, conviction: Conviction::Locked1x };
 const BIG_NAY: Vote = Vote { aye: false, conviction: Conviction::Locked1x };
 
 impl_outer_origin! {
-	pub enum Origin for Test  where system = frame_system {}
+	pub enum Origin for Test where system = frame_system {}
 }
 
 impl_outer_dispatch! {

diff --git a/frame/evm/src/tests.rs b/frame/evm/src/tests.rs
@@ -14,7 +14,7 @@ use sp_runtime::{
 };
 
 impl_outer_origin! {
-	pub enum Origin for Test  where system = frame_system {}
+	pub enum Origin for Test where system = frame_system {}
 }
 
 impl_outer_dispatch! {

diff --git a/frame/example-offchain-worker/src/tests.rs b/frame/example-offchain-worker/src/tests.rs
@@ -39,7 +39,7 @@ use sp_runtime::{
 };
 
 impl_outer_origin! {
-	pub enum Origin for Test  where system = frame_system {}
+	pub enum Origin for Test where system = frame_system {}
 }
 
 // For testing the module, we construct most of a mock runtime. This means

diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
@@ -723,7 +723,7 @@ mod tests {
 	};
 
 	impl_outer_origin! {
-		pub enum Origin for Test  where system = frame_system {}
+		pub enum Origin for Test where system = frame_system {}
 	}
 
 	impl_outer_dispatch! {

diff --git a/frame/finality-tracker/src/lib.rs b/frame/finality-tracker/src/lib.rs
@@ -231,7 +231,7 @@ mod tests {
 	pub struct Test;
 
 	impl_outer_origin! {
-		pub enum Origin for Test  where system = frame_system {}
+		pub enum Origin for Test where system = frame_system {}
 	}
 
 	thread_local! {

diff --git a/frame/identity/src/benchmarking.rs b/frame/identity/src/benchmarking.rs
@@ -172,6 +172,48 @@ benchmarks! {
 
 	}: _(RawOrigin::Signed(caller), subs)
 
+	add_sub {
+		let caller = account::<T>("caller", 0);
+
+		// Give them p many previous sub accounts.
+		let p in 1 .. T::MaxSubAccounts::get() - 1 => {
+			let _ = add_sub_accounts::<T>(&caller, p)?;
+		};
+		let sub = account::<T>("new_sub", 0);
+		let data = Data::Raw(vec![0; 32]);
+	}: _(RawOrigin::Signed(caller), T::Lookup::unlookup(sub), data)
+
+	rename_sub {
+		let caller = account::<T>("caller", 0);
+
+		let p in 1 .. T::MaxSubAccounts::get();
+
+		// Give them p many previous sub accounts.
+		let (sub, _) = add_sub_accounts::<T>(&caller, p)?.remove(0);
+		let data = Data::Raw(vec![1; 32]);
+
+	}: _(RawOrigin::Signed(caller), T::Lookup::unlookup(sub), data)
+
+	remove_sub {
+		let caller = account::<T>("caller", 0);
+
+		// Give them p many previous sub accounts.
+		let p in 1 .. T::MaxSubAccounts::get();
+		let (sub, _) = add_sub_accounts::<T>(&caller, p)?.remove(0);
+	}: _(RawOrigin::Signed(caller), T::Lookup::unlookup(sub))
+
+	quit_sub {
+		let caller = account::<T>("caller", 0);
+		let sup = account::<T>("super", 0);
+
+		// Give them p many previous sub accounts.
+		let p in 1 .. T::MaxSubAccounts::get() - 1 => {
+			let _ = add_sub_accounts::<T>(&sup, p)?;
+		};
+		let sup_origin = RawOrigin::Signed(sup).into();
+		Identity::<T>::add_sub(sup_origin, T::Lookup::unlookup(caller.clone()), Data::Raw(vec![0; 32]))?;
+	}: _(RawOrigin::Signed(caller))
+
 	clear_identity {
 		let caller = account::<T>("caller", 0);
 		let caller_origin = <T as frame_system::Trait>::Origin::from(RawOrigin::Signed(caller.clone()));