`47c39a449fef`

5 files changed

modifiedpallets/common/src/benchmarking.rsdiff before after both

98					token_owner: false,98					token_owner: false,
99					collection_admin: false,99					collection_admin: false,
100					restricted: None,100					restricted: None,
101					#[cfg(feature = "runtime-benchmarks")]
101					permissive: true,102					permissive: true,
102				}),103				}),
103				mint_mode: Some(true),104				mint_mode: Some(true),

modifiedpallets/common/src/lib.rsdiff before after both

1212		limit_default_clone!(old_limit, new_limit,1212		limit_default_clone!(old_limit, new_limit,
1213			access => {},1213			access => {},
1214			mint_mode => {},1214			mint_mode => {},
1215			nesting => {1215			nesting => { /* todo check for permissive, if only it gets out of benchmarks */ },
1216				#[cfg(not(feature = "runtime-benchmarks"))]
1217				ensure!(
1218					// Permissive is only allowed for tests and internal usage of chain for now
1219					old_limit.permissive || !new_limit.permissive,
1220					<Error<T>>::NoPermission,
1221				)
1222			},
1223		);1216		);
1224		Ok(new_limit)1217		Ok(new_limit)

modifiedpallets/nonfungible/src/lib.rsdiff before after both

1039	) -> DispatchResult {1039	) -> DispatchResult {
1040		let nesting = handle.permissions.nesting();1040		let nesting = handle.permissions.nesting();
1041		
1042		#[cfg(not(feature = "runtime-benchmarks"))]
1043		let permissive = false;
1044		#[cfg(feature = "runtime-benchmarks")]
1041		if nesting.permissive {1045		let permissive = nesting.permissive;
1046
1047		if permissive {
1042			// Pass1048			// Pass
1043		} else if nesting.token_owner1049		} else if nesting.token_owner
1044			&& <PalletStructure<T>>::check_indirectly_owned(1050			&& <PalletStructure<T>>::check_indirectly_owned(

modifiedpallets/proxy-rmrk-core/src/lib.rsdiff before after both

205						token_owner: true,205						token_owner: true,
206						collection_admin: false,206						collection_admin: false,
207						restricted: None,207						restricted: None,
208208						#[cfg(feature = "runtime-benchmarks")]
209						permissive: false,209						permissive: false,
210					}),210					}),
211					..Default::default()211					..Default::default()

modifiedprimitives/data-structs/src/lib.rsdiff before after both

454			token_owner: false,454			token_owner: false,
455			collection_admin: false,455			collection_admin: false,
456			restricted: None,456			restricted: None,
457457			#[cfg(feature = "runtime-benchmarks")]
458			permissive: false,458			permissive: false,
459		};459		};
460		self.nesting.as_ref().unwrap_or(&DEFAULT)460		self.nesting.as_ref().unwrap_or(&DEFAULT)
499	/// If set - only tokens from specified collections can be nested499	/// If set - only tokens from specified collections can be nested
500	pub restricted: Option<OwnerRestrictedSet>,500	pub restricted: Option<OwnerRestrictedSet>,
501501
502	#[cfg(feature = "runtime-benchmarks")]
502	/// Anyone can nest tokens, mutually exclusive with `token_owner`, `admin`503	/// Anyone can nest tokens, mutually exclusive with `token_owner`, `admin`
503	pub permissive: bool,504	pub permissive: bool,
504}505}