Fix merge artifacts

frame/nfts/src/benchmarking.rs

@@ -775,15 +775,13 @@ benchmarks_instance_pallet! {
 
 	set_attributes_pre_signed {
 		let n in 0 .. T::MaxAttributesPerCall::get() as u32;
-		let (collection, caller, _) = create_collection::<T, I>();
+		let (collection, _, _) = create_collection::<T, I>();
 
 		let item_owner: T::AccountId = account("item_owner", 0, SEED);
 		let item_owner_lookup = T::Lookup::unlookup(item_owner.clone());
 
-		let account_public = sr25519_generate(0.into(), None);
-		let account_signer = MultiSigner::Sr25519(account_public);
-		let account = Nfts::<T, I>::signer_to_account(account_signer.clone()).unwrap();
-		let account_lookup = T::Lookup::unlookup(account.clone());
+		let signer_public = sr25519_generate(0.into(), None);
+		let signer: T::AccountId = MultiSigner::Sr25519(signer_public).into_account().into();
 
 		T::Currency::make_free_balance_be(&item_owner, DepositBalanceOf::<T, I>::max_value());
 
@@ -806,20 +804,20 @@ benchmarks_instance_pallet! {
 			collection,
 			item,
 			attributes,
-			namespace: AttributeNamespace::Account(account.clone()),
+			namespace: AttributeNamespace::Account(signer.clone()),
 			deadline: One::one(),
 		};
 		let message = Encode::encode(&pre_signed_data);
-		let signature = MultiSignature::Sr25519(sr25519_sign(0.into(), &account_public, &message).unwrap());
+		let signature = MultiSignature::Sr25519(sr25519_sign(0.into(), &signer_public, &message).unwrap());
 
 		frame_system::Pallet::<T>::set_block_number(One::one());
-	}: _(SystemOrigin::Signed(item_owner.clone()), pre_signed_data, signature, account_signer)
+	}: _(SystemOrigin::Signed(item_owner.clone()), pre_signed_data, signature.into(), signer.clone())
 	verify {
 		assert_last_event::<T, I>(
 			Event::PreSignedAttributesSet {
 				collection,
 				item,
-				namespace: AttributeNamespace::Account(account.clone()),
+				namespace: AttributeNamespace::Account(signer.clone()),
 			}
 			.into(),
 		);

frame/nfts/src/lib.rs

@@ -1850,17 +1850,13 @@ pub mod pallet {
 		pub fn set_attributes_pre_signed(
 			origin: OriginFor<T>,
 			data: PreSignedAttributesOf<T, I>,
-			signature: MultiSignature,
-			signer: MultiSigner,
+			signature: T::OffchainSignature,
+			signer: T::AccountId,
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 			let msg = Encode::encode(&data);
-			ensure!(
-				signature.verify(&*msg, &signer.clone().into_account()),
-				Error::<T, I>::WrongSignature
-			);
-			let signer_account = Self::signer_to_account(signer)?;
-			Self::do_set_attributes_pre_signed(origin, data, signer_account)
+			ensure!(signature.verify(&*msg, &signer), Error::<T, I>::WrongSignature);
+			Self::do_set_attributes_pre_signed(origin, data, signer)
 		}
 	}
 }

frame/nfts/src/tests.rs

@@ -3182,23 +3182,29 @@ fn pre_signed_attributes_should_work() {
 	new_test_ext().execute_with(|| {
 		let user_1_pair = sp_core::sr25519::Pair::from_string("//Alice", None).unwrap();
 		let user_1_signer = MultiSigner::Sr25519(user_1_pair.public());
-		let user_1 = Nfts::signer_to_account(user_1_signer.clone()).unwrap();
-		let user_2 = 2;
+		let user_1 = user_1_signer.clone().into_account();
+		let user_2 = account(2);
 		let user_3_pair = sp_core::sr25519::Pair::from_string("//Bob", None).unwrap();
 		let user_3_signer = MultiSigner::Sr25519(user_3_pair.public());
-		let user_3 = Nfts::signer_to_account(user_3_signer.clone()).unwrap();
+		let user_3 = user_3_signer.clone().into_account();
 		let collection_id = 0;
 		let item_id = 0;
 
 		Balances::make_free_balance_be(&user_1, 100);
 		Balances::make_free_balance_be(&user_2, 100);
 		Balances::make_free_balance_be(&user_3, 100);
 		assert_ok!(Nfts::create(
-			RuntimeOrigin::signed(user_1),
-			user_1,
+			RuntimeOrigin::signed(user_1.clone()),
+			user_1.clone(),
 			collection_config_with_all_settings_enabled(),
 		));
-		assert_ok!(Nfts::mint(RuntimeOrigin::signed(user_1), collection_id, item_id, user_2, None));
+		assert_ok!(Nfts::mint(
+			RuntimeOrigin::signed(user_1.clone()),
+			collection_id,
+			item_id,
+			user_2.clone(),
+			None,
+		));
 
 		// validate the CollectionOwner namespace
 		let pre_signed_data = PreSignedAttributes {
@@ -3212,10 +3218,10 @@ fn pre_signed_attributes_should_work() {
 		let signature = MultiSignature::Sr25519(user_1_pair.sign(&message));
 
 		assert_ok!(Nfts::set_attributes_pre_signed(
-			RuntimeOrigin::signed(user_2),
+			RuntimeOrigin::signed(user_2.clone()),
 			pre_signed_data.clone(),
 			signature.clone(),
-			user_1_signer.clone(),
+			user_1.clone(),
 		));
 
 		assert_eq!(
@@ -3233,15 +3239,15 @@ fn pre_signed_attributes_should_work() {
 			&attribute_key,
 		))
 		.unwrap();
-		assert_eq!(deposit.account, Some(user_2));
+		assert_eq!(deposit.account, Some(user_2.clone()));
 		assert_eq!(deposit.amount, 3);
 
 		assert_eq!(Balances::free_balance(&user_1), 100 - 2 - 1); // 2 - collection deposit, 1 - item deposit
 		assert_eq!(Balances::free_balance(&user_2), 100 - 6); // 6 - attributes
 
 		// validate the deposit gets returned on attribute update from collection's owner
 		assert_ok!(Nfts::set_attribute(
-			RuntimeOrigin::signed(user_1),
+			RuntimeOrigin::signed(user_1.clone()),
 			collection_id,
 			Some(item_id),
 			AttributeNamespace::CollectionOwner,
@@ -3263,60 +3269,60 @@ fn pre_signed_attributes_should_work() {
 			collection: 0,
 			item: 0,
 			attributes: vec![(vec![0], vec![1]), (vec![2], vec![3])],
-			namespace: AttributeNamespace::Account(user_3),
+			namespace: AttributeNamespace::Account(user_3.clone()),
 			deadline: 10000000,
 		};
 		let message = Encode::encode(&pre_signed_data);
 		let signature = MultiSignature::Sr25519(user_3_pair.sign(&message));
 
 		assert_ok!(Nfts::set_attributes_pre_signed(
-			RuntimeOrigin::signed(user_2),
+			RuntimeOrigin::signed(user_2.clone()),
 			pre_signed_data.clone(),
 			signature.clone(),
-			user_3_signer.clone(),
+			user_3.clone(),
 		));
 
 		assert_eq!(
 			attributes(0),
 			vec![
 				(Some(0), AttributeNamespace::CollectionOwner, bvec![0], bvec![1]),
-				(Some(0), AttributeNamespace::Account(user_3), bvec![0], bvec![1]),
+				(Some(0), AttributeNamespace::Account(user_3.clone()), bvec![0], bvec![1]),
 				(Some(0), AttributeNamespace::CollectionOwner, bvec![2], bvec![3]),
-				(Some(0), AttributeNamespace::Account(user_3), bvec![2], bvec![3]),
+				(Some(0), AttributeNamespace::Account(user_3.clone()), bvec![2], bvec![3]),
 			]
 		);
 
 		let attribute_key: BoundedVec<_, _> = bvec![0];
 		let (_, deposit) = Attribute::<Test>::get((
 			0,
 			Some(0),
-			AttributeNamespace::Account(user_3),
+			AttributeNamespace::Account(user_3.clone()),
 			&attribute_key,
 		))
 		.unwrap();
-		assert_eq!(deposit.account, Some(user_2));
+		assert_eq!(deposit.account, Some(user_2.clone()));
 		assert_eq!(deposit.amount, 3);
 
 		assert_eq!(Balances::free_balance(&user_2), 100 - 9);
 		assert_eq!(Balances::free_balance(&user_3), 100);
 
 		// validate the deposit gets returned on attribute update from user_3
 		assert_ok!(Nfts::set_attribute(
-			RuntimeOrigin::signed(user_3),
+			RuntimeOrigin::signed(user_3.clone()),
 			collection_id,
 			Some(item_id),
-			AttributeNamespace::Account(user_3),
+			AttributeNamespace::Account(user_3.clone()),
 			bvec![0],
 			bvec![1],
 		));
 		let (_, deposit) = Attribute::<Test>::get((
 			0,
 			Some(0),
-			AttributeNamespace::Account(user_3),
+			AttributeNamespace::Account(user_3.clone()),
 			&attribute_key,
 		))
 		.unwrap();
-		assert_eq!(deposit.account, Some(user_3));
+		assert_eq!(deposit.account, Some(user_3.clone()));
 		assert_eq!(deposit.amount, 3);
 
 		assert_eq!(Balances::free_balance(&user_2), 100 - 6);
@@ -3325,21 +3331,21 @@ fn pre_signed_attributes_should_work() {
 		// can't update with the wrong signature
 		assert_noop!(
 			Nfts::set_attributes_pre_signed(
-				RuntimeOrigin::signed(user_2),
+				RuntimeOrigin::signed(user_2.clone()),
 				pre_signed_data.clone(),
 				signature.clone(),
-				user_1_signer.clone(),
+				user_1.clone(),
 			),
 			Error::<Test>::WrongSignature
 		);
 
 		// can't update if I don't own that item
 		assert_noop!(
 			Nfts::set_attributes_pre_signed(
-				RuntimeOrigin::signed(user_3),
+				RuntimeOrigin::signed(user_3.clone()),
 				pre_signed_data.clone(),
 				signature.clone(),
-				user_3_signer.clone(),
+				user_3.clone(),
 			),
 			Error::<Test>::NoPermission
 		);
@@ -3358,10 +3364,10 @@ fn pre_signed_attributes_should_work() {
 
 		assert_noop!(
 			Nfts::set_attributes_pre_signed(
-				RuntimeOrigin::signed(user_2),
+				RuntimeOrigin::signed(user_2.clone()),
 				pre_signed_data.clone(),
 				signature.clone(),
-				user_3_signer.clone(),
+				user_3.clone(),
 			),
 			Error::<Test>::NoPermission
 		);
@@ -3370,10 +3376,10 @@ fn pre_signed_attributes_should_work() {
 		System::set_block_number(10000001);
 		assert_noop!(
 			Nfts::set_attributes_pre_signed(
-				RuntimeOrigin::signed(user_2),
+				RuntimeOrigin::signed(user_2.clone()),
 				pre_signed_data.clone(),
 				signature.clone(),
-				user_3_signer.clone(),
+				user_3.clone(),
 			),
 			Error::<Test>::DeadlineExpired
 		);
@@ -3392,10 +3398,10 @@ fn pre_signed_attributes_should_work() {
 
 		assert_noop!(
 			Nfts::set_attributes_pre_signed(
-				RuntimeOrigin::signed(user_2),
+				RuntimeOrigin::signed(user_2.clone()),
 				pre_signed_data.clone(),
 				signature.clone(),
-				user_1_signer.clone(),
+				user_1.clone(),
 			),
 			Error::<Test>::UnknownItem
 		);
@@ -3413,10 +3419,10 @@ fn pre_signed_attributes_should_work() {
 
 		assert_noop!(
 			Nfts::set_attributes_pre_signed(
-				RuntimeOrigin::signed(user_2),
+				RuntimeOrigin::signed(user_2.clone()),
 				pre_signed_data.clone(),
 				signature.clone(),
-				user_1_signer.clone(),
+				user_1.clone(),
 			),
 			Error::<Test>::MaxAttributesLimitReached
 		);