Minor Uniques pallet improvements and XCM v3 preparations (#10896)

* Introduce Helper to Uniques for benchmark stuff

* Fixes

* Formatting

* Featuregate the Helper, include ContainsPair

* Introduce & use EnsureOriginWithArg

* Benchmarking

* Docs

* More ContainsBoth helpers

* Formatting

* Formatting

* Fixes

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

substrate/frame/uniques/src/benchmarking.rs

@@ -40,12 +40,13 @@ fn create_class<T: Config<I>, I: 'static>(
 ) -> (T::ClassId, T::AccountId, <T::Lookup as StaticLookup>::Source) {
 	let caller: T::AccountId = whitelisted_caller();
 	let caller_lookup = T::Lookup::unlookup(caller.clone());
-	let class = Default::default();
+	let class = T::Helper::class(0);
 	T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
-	assert!(Uniques::<T, I>::create(
-		SystemOrigin::Signed(caller.clone()).into(),
+	assert!(Uniques::<T, I>::force_create(
+		SystemOrigin::Root.into(),
 		class,
 		caller_lookup.clone(),
+		false,
 	)
 	.is_ok());
 	(class, caller, caller_lookup)
@@ -53,14 +54,14 @@ fn create_class<T: Config<I>, I: 'static>(
 
 fn add_class_metadata<T: Config<I>, I: 'static>(
 ) -> (T::AccountId, <T::Lookup as StaticLookup>::Source) {
-	let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().owner;
+	let caller = Class::<T, I>::get(T::Helper::class(0)).unwrap().owner;
 	if caller != whitelisted_caller() {
 		whitelist_account!(caller);
 	}
 	let caller_lookup = T::Lookup::unlookup(caller.clone());
 	assert!(Uniques::<T, I>::set_class_metadata(
 		SystemOrigin::Signed(caller.clone()).into(),
-		Default::default(),
+		T::Helper::class(0),
 		vec![0; T::StringLimit::get() as usize].try_into().unwrap(),
 		false,
 	)
@@ -71,15 +72,15 @@ fn add_class_metadata<T: Config<I>, I: 'static>(
 fn mint_instance<T: Config<I>, I: 'static>(
 	index: u16,
 ) -> (T::InstanceId, T::AccountId, <T::Lookup as StaticLookup>::Source) {
-	let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().admin;
+	let caller = Class::<T, I>::get(T::Helper::class(0)).unwrap().admin;
 	if caller != whitelisted_caller() {
 		whitelist_account!(caller);
 	}
 	let caller_lookup = T::Lookup::unlookup(caller.clone());
-	let instance = index.into();
+	let instance = T::Helper::instance(index);
 	assert!(Uniques::<T, I>::mint(
 		SystemOrigin::Signed(caller.clone()).into(),
-		Default::default(),
+		T::Helper::class(0),
 		instance,
 		caller_lookup.clone(),
 	)
@@ -90,14 +91,14 @@ fn mint_instance<T: Config<I>, I: 'static>(
 fn add_instance_metadata<T: Config<I>, I: 'static>(
 	instance: T::InstanceId,
 ) -> (T::AccountId, <T::Lookup as StaticLookup>::Source) {
-	let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().owner;
+	let caller = Class::<T, I>::get(T::Helper::class(0)).unwrap().owner;
 	if caller != whitelisted_caller() {
 		whitelist_account!(caller);
 	}
 	let caller_lookup = T::Lookup::unlookup(caller.clone());
 	assert!(Uniques::<T, I>::set_metadata(
 		SystemOrigin::Signed(caller.clone()).into(),
-		Default::default(),
+		T::Helper::class(0),
 		instance,
 		vec![0; T::StringLimit::get() as usize].try_into().unwrap(),
 		false,
@@ -109,7 +110,7 @@ fn add_instance_metadata<T: Config<I>, I: 'static>(
 fn add_instance_attribute<T: Config<I>, I: 'static>(
 	instance: T::InstanceId,
 ) -> (BoundedVec<u8, T::KeyLimit>, T::AccountId, <T::Lookup as StaticLookup>::Source) {
-	let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().owner;
+	let caller = Class::<T, I>::get(T::Helper::class(0)).unwrap().owner;
 	if caller != whitelisted_caller() {
 		whitelist_account!(caller);
 	}
@@ -117,7 +118,7 @@ fn add_instance_attribute<T: Config<I>, I: 'static>(
 	let key: BoundedVec<_, _> = vec![0; T::KeyLimit::get() as usize].try_into().unwrap();
 	assert!(Uniques::<T, I>::set_attribute(
 		SystemOrigin::Signed(caller.clone()).into(),
-		Default::default(),
+		T::Helper::class(0),
 		Some(instance),
 		key.clone(),
 		vec![0; T::ValueLimit::get() as usize].try_into().unwrap(),
@@ -136,20 +137,24 @@ fn assert_last_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::
 
 benchmarks_instance_pallet! {
 	create {
-		let caller: T::AccountId = whitelisted_caller();
-		let caller_lookup = T::Lookup::unlookup(caller.clone());
+		let class = T::Helper::class(0);
+		let origin = T::CreateOrigin::successful_origin(&class);
+		let caller = T::CreateOrigin::ensure_origin(origin.clone(), &class).unwrap();
+		whitelist_account!(caller);
+		let admin = T::Lookup::unlookup(caller.clone());
 		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
-	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
+		let call = Call::<T, I>::create { class, admin };
+	}: { call.dispatch_bypass_filter(origin)? }
 	verify {
-		assert_last_event::<T, I>(Event::Created { class: Default::default(), creator: caller.clone(), owner: caller }.into());
+		assert_last_event::<T, I>(Event::Created { class: T::Helper::class(0), creator: caller.clone(), owner: caller }.into());
 	}
 
 	force_create {
 		let caller: T::AccountId = whitelisted_caller();
 		let caller_lookup = T::Lookup::unlookup(caller.clone());
-	}: _(SystemOrigin::Root, Default::default(), caller_lookup, true)
+	}: _(SystemOrigin::Root, T::Helper::class(0), caller_lookup, true)
 	verify {
-		assert_last_event::<T, I>(Event::ForceCreated { class: Default::default(), owner: caller }.into());
+		assert_last_event::<T, I>(Event::ForceCreated { class: T::Helper::class(0), owner: caller }.into());
 	}
 
 	destroy {
@@ -163,10 +168,10 @@ benchmarks_instance_pallet! {
 			mint_instance::<T, I>(i as u16);
 		}
 		for i in 0..m {
-			add_instance_metadata::<T, I>((i as u16).into());
+			add_instance_metadata::<T, I>(T::Helper::instance(i as u16));
 		}
 		for i in 0..a {
-			add_instance_attribute::<T, I>((i as u16).into());
+			add_instance_attribute::<T, I>(T::Helper::instance(i as u16));
 		}
 		let witness = Class::<T, I>::get(class).unwrap().destroy_witness();
 	}: _(SystemOrigin::Signed(caller), class, witness)
@@ -176,7 +181,7 @@ benchmarks_instance_pallet! {
 
 	mint {
 		let (class, caller, caller_lookup) = create_class::<T, I>();
-		let instance = Default::default();
+		let instance = T::Helper::instance(0);
 	}: _(SystemOrigin::Signed(caller.clone()), class, instance, caller_lookup)
 	verify {
 		assert_last_event::<T, I>(Event::Issued { class, instance, owner: caller }.into());
@@ -192,7 +197,7 @@ benchmarks_instance_pallet! {
 
 	transfer {
 		let (class, caller, caller_lookup) = create_class::<T, I>();
-		let (instance, ..) = mint_instance::<T, I>(Default::default());
+		let (instance, ..) = mint_instance::<T, I>(0);
 
 		let target: T::AccountId = account("target", 0, SEED);
 		let target_lookup = T::Lookup::unlookup(target.clone());
@@ -222,15 +227,15 @@ benchmarks_instance_pallet! {
 
 	freeze {
 		let (class, caller, caller_lookup) = create_class::<T, I>();
-		let (instance, ..) = mint_instance::<T, I>(Default::default());
-	}: _(SystemOrigin::Signed(caller.clone()), Default::default(), Default::default())
+		let (instance, ..) = mint_instance::<T, I>(0);
+	}: _(SystemOrigin::Signed(caller.clone()), T::Helper::class(0), T::Helper::instance(0))
 	verify {
-		assert_last_event::<T, I>(Event::Frozen { class: Default::default(), instance: Default::default() }.into());
+		assert_last_event::<T, I>(Event::Frozen { class: T::Helper::class(0), instance: T::Helper::instance(0) }.into());
 	}
 
 	thaw {
 		let (class, caller, caller_lookup) = create_class::<T, I>();
-		let (instance, ..) = mint_instance::<T, I>(Default::default());
+		let (instance, ..) = mint_instance::<T, I>(0);
 		Uniques::<T, I>::freeze(
 			SystemOrigin::Signed(caller.clone()).into(),
 			class,
@@ -262,6 +267,8 @@ benchmarks_instance_pallet! {
 		let target: T::AccountId = account("target", 0, SEED);
 		let target_lookup = T::Lookup::unlookup(target.clone());
 		T::Currency::make_free_balance_be(&target, T::Currency::minimum_balance());
+		let origin = SystemOrigin::Signed(target.clone()).into();
+		Uniques::<T, I>::set_accept_ownership(origin, Some(class.clone()))?;
 	}: _(SystemOrigin::Signed(caller), class, target_lookup)
 	verify {
 		assert_last_event::<T, I>(Event::OwnerChanged { class, new_owner: target }.into());
@@ -272,7 +279,7 @@ benchmarks_instance_pallet! {
 		let target0 = T::Lookup::unlookup(account("target", 0, SEED));
 		let target1 = T::Lookup::unlookup(account("target", 1, SEED));
 		let target2 = T::Lookup::unlookup(account("target", 2, SEED));
-	}: _(SystemOrigin::Signed(caller), Default::default(), target0.clone(), target1.clone(), target2.clone())
+	}: _(SystemOrigin::Signed(caller), class, target0.clone(), target1.clone(), target2.clone())
 	verify {
 		assert_last_event::<T, I>(Event::TeamChanged{
 			class,
@@ -379,5 +386,17 @@ benchmarks_instance_pallet! {
 		assert_last_event::<T, I>(Event::ApprovalCancelled { class, instance, owner: caller, delegate }.into());
 	}
 
+	set_accept_ownership {
+		let caller: T::AccountId = whitelisted_caller();
+		T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
+		let class = T::Helper::class(0);
+	}: _(SystemOrigin::Signed(caller.clone()), Some(class.clone()))
+	verify {
+		assert_last_event::<T, I>(Event::OwnershipAcceptanceChanged {
+			who: caller,
+			maybe_class: Some(class),
+		}.into());
+	}
+
 	impl_benchmark_test_suite!(Uniques, crate::mock::new_test_ext(), crate::mock::Test);
 }