git.delta.rocks / unique-network / refs/commits / e25275acc906

difftreelog

chore fix code review requess

Grigoriy Simonov2022-12-07parent: #72b01ba.patch.diff
in: master

7 files changed

modifiedpallets/fungible/src/common.rsdiffbeforeafterboth
--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -435,7 +435,7 @@
 		_operator: T::CrossAccountId,
 		_approve: bool,
 	) -> DispatchResultWithPostInfo {
-		fail!(<Error<T>>::SettingApprovalForAllNotAllowed)
+		fail!(<Error<T>>::SettingAllowanceForAllNotAllowed)
 	}
 
 	fn allowance_for_all(&self, _owner: T::CrossAccountId, _operator: T::CrossAccountId) -> bool {
modifiedpallets/fungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -128,7 +128,7 @@
 		/// Setting item properties is not allowed.
 		SettingPropertiesNotAllowed,
 		/// Setting approval for all is not allowed.
-		SettingApprovalForAllNotAllowed,
+		SettingAllowanceForAllNotAllowed,
 	}
 
 	#[pallet::config]
modifiedpallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -226,14 +226,14 @@
 	set_allowance_for_all {
 		bench_init!{
 			owner: sub; collection: collection(owner);
-			operator: cross_from_sub(owner); owner: cross_sub;
+			operator: cross_sub(owner); owner: cross_sub;
 		};
 	}: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)}
 
 	allowance_for_all {
 		bench_init!{
 			owner: sub; collection: collection(owner);
-			operator: cross_from_sub(owner); owner: cross_sub;
+			operator: cross_sub(owner); owner: cross_sub;
 		};
 	}: {<Pallet<T>>::allowance_for_all(&collection, &owner, &operator)}
 }
modifiedtests/src/interfaces/augment-api-errors.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-errors.ts
+++ b/tests/src/interfaces/augment-api-errors.ts
@@ -388,7 +388,7 @@
       /**
        * Setting approval for all is not allowed.
        **/
-      SettingApprovalForAllNotAllowed: AugmentedError<ApiType>;
+      SettingAllowanceForAllNotAllowed: AugmentedError<ApiType>;
       /**
        * Setting item properties is not allowed.
        **/
modifiedtests/src/interfaces/default/types.tsdiffbeforeafterboth
--- a/tests/src/interfaces/default/types.ts
+++ b/tests/src/interfaces/default/types.ts
@@ -1605,8 +1605,8 @@
   readonly isFungibleItemsDontHaveData: boolean;
   readonly isFungibleDisallowsNesting: boolean;
   readonly isSettingPropertiesNotAllowed: boolean;
-  readonly isSettingApprovalForAllNotAllowed: boolean;
-  readonly type: 'NotFungibleDataUsedToMintFungibleCollectionToken' | 'FungibleItemsHaveNoId' | 'FungibleItemsDontHaveData' | 'FungibleDisallowsNesting' | 'SettingPropertiesNotAllowed' | 'SettingApprovalForAllNotAllowed';
+  readonly isSettingAllowanceForAllNotAllowed: boolean;
+  readonly type: 'NotFungibleDataUsedToMintFungibleCollectionToken' | 'FungibleItemsHaveNoId' | 'FungibleItemsDontHaveData' | 'FungibleDisallowsNesting' | 'SettingPropertiesNotAllowed' | 'SettingAllowanceForAllNotAllowed';
 }
 
 /** @name PalletInflationCall */
modifiedtests/src/interfaces/lookup.tsdiffbeforeafterboth
3451 * Lookup430: pallet_fungible::pallet::Error<T>3451 * Lookup430: pallet_fungible::pallet::Error<T>
3452 **/3452 **/
3453 PalletFungibleError: {3453 PalletFungibleError: {
3454 _enum: ['NotFungibleDataUsedToMintFungibleCollectionToken', 'FungibleItemsHaveNoId', 'FungibleItemsDontHaveData', 'FungibleDisallowsNesting', 'SettingPropertiesNotAllowed', 'SettingApprovalForAllNotAllowed']3454 _enum: ['NotFungibleDataUsedToMintFungibleCollectionToken', 'FungibleItemsHaveNoId', 'FungibleItemsDontHaveData', 'FungibleDisallowsNesting', 'SettingPropertiesNotAllowed', 'SettingAllowanceForAllNotAllowed']
3455 },3455 },
3456 /**3456 /**
3457 * Lookup431: pallet_refungible::ItemData3457 * Lookup431: pallet_refungible::ItemData
modifiedtests/src/interfaces/types-lookup.tsdiffbeforeafterboth
--- a/tests/src/interfaces/types-lookup.ts
+++ b/tests/src/interfaces/types-lookup.ts
@@ -3663,8 +3663,8 @@
     readonly isFungibleItemsDontHaveData: boolean;
     readonly isFungibleDisallowsNesting: boolean;
     readonly isSettingPropertiesNotAllowed: boolean;
-    readonly isSettingApprovalForAllNotAllowed: boolean;
-    readonly type: 'NotFungibleDataUsedToMintFungibleCollectionToken' | 'FungibleItemsHaveNoId' | 'FungibleItemsDontHaveData' | 'FungibleDisallowsNesting' | 'SettingPropertiesNotAllowed' | 'SettingApprovalForAllNotAllowed';
+    readonly isSettingAllowanceForAllNotAllowed: boolean;
+    readonly type: 'NotFungibleDataUsedToMintFungibleCollectionToken' | 'FungibleItemsHaveNoId' | 'FungibleItemsDontHaveData' | 'FungibleDisallowsNesting' | 'SettingPropertiesNotAllowed' | 'SettingAllowanceForAllNotAllowed';
   }
 
   /** @name PalletRefungibleItemData (431) */