git.delta.rocks / unique-network / refs/commits / 7871a15dcd1a

--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1311,14 +1311,14 @@
 		sender: T::CrossAccountId,
 		token_id: TokenId,
 		property: Vec<Property>,
-		budget: &dyn Budget,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo;
 	fn delete_token_properties(
 		&self,
 		sender: T::CrossAccountId,
 		token_id: TokenId,
 		property_keys: Vec<PropertyKey>,
-		budget: &dyn Budget,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo;
 	fn set_token_property_permissions(
 		&self,
@@ -1363,7 +1363,7 @@
 		sender: T::CrossAccountId,
 		from: (CollectionId, TokenId),
 		under: TokenId,
-		budget: &dyn Budget,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResult;
 
 	fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId));

--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -298,7 +298,7 @@
 		_sender: T::CrossAccountId,
 		_token_id: TokenId,
 		_property: Vec<Property>,
-		_budget: &dyn Budget,
+		_nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		fail!(<Error<T>>::SettingPropertiesNotAllowed)
 	}
@@ -316,7 +316,7 @@
 		_sender: T::CrossAccountId,
 		_token_id: TokenId,
 		_property_keys: Vec<PropertyKey>,
-		_budget: &dyn Budget,
+		_nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		fail!(<Error<T>>::SettingPropertiesNotAllowed)
 	}
@@ -326,7 +326,7 @@
 		_sender: <T>::CrossAccountId,
 		_from: (CollectionId, TokenId),
 		_under: TokenId,
-		_budget: &dyn Budget,
+		_nesting_budget: &dyn Budget,
 	) -> sp_runtime::DispatchResult {
 		fail!(<Error<T>>::FungibleDisallowsNesting)
 	}

--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -220,12 +220,12 @@
 		sender: T::CrossAccountId,
 		token_id: TokenId,
 		properties: Vec<Property>,
-		budget: &dyn Budget,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);
 
 		with_weight(
-			<Pallet<T>>::set_token_properties(self, &sender, token_id, properties, false, budget),
+			<Pallet<T>>::set_token_properties(self, &sender, token_id, properties, false, nesting_budget),
 			weight,
 		)
 	}
@@ -235,12 +235,12 @@
 		sender: T::CrossAccountId,
 		token_id: TokenId,
 		property_keys: Vec<PropertyKey>,
-		budget: &dyn Budget,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		let weight = <CommonWeights<T>>::delete_token_properties(property_keys.len() as u32);
 
 		with_weight(
-			<Pallet<T>>::delete_token_properties(self, &sender, token_id, property_keys, budget),
+			<Pallet<T>>::delete_token_properties(self, &sender, token_id, property_keys, nesting_budget),
 			weight,
 		)
 	}
@@ -370,9 +370,9 @@
 		sender: T::CrossAccountId,
 		from: (CollectionId, TokenId),
 		under: TokenId,
-		budget: &dyn Budget,
+		nesting_budget: &dyn Budget,
 	) -> sp_runtime::DispatchResult {
-		<Pallet<T>>::check_nesting(self, sender, from, under, budget)
+		<Pallet<T>>::check_nesting(self, sender, from, under, nesting_budget)
 	}
 
 	fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId)) {

314		_sender: T::CrossAccountId,314		_sender: T::CrossAccountId,
315		_token_id: TokenId,315		_token_id: TokenId,
316		_property: Vec<Property>,316		_property: Vec<Property>,
317		_budget: &dyn Budget,317		_nesting_budget: &dyn Budget,
318	) -> DispatchResultWithPostInfo {318	) -> DispatchResultWithPostInfo {
319		fail!(<Error<T>>::SettingPropertiesNotAllowed)319		fail!(<Error<T>>::SettingPropertiesNotAllowed)
320	}320	}
332		_sender: T::CrossAccountId,332		_sender: T::CrossAccountId,
333		_token_id: TokenId,333		_token_id: TokenId,
334		_property_keys: Vec<PropertyKey>,334		_property_keys: Vec<PropertyKey>,
335		_budget: &dyn Budget,335		_nesting_budget: &dyn Budget,
336	) -> DispatchResultWithPostInfo {336	) -> DispatchResultWithPostInfo {
337		fail!(<Error<T>>::SettingPropertiesNotAllowed)337		fail!(<Error<T>>::SettingPropertiesNotAllowed)
338	}338	}
342		_sender: <T>::CrossAccountId,342		_sender: <T>::CrossAccountId,
343		_from: (CollectionId, TokenId),343		_from: (CollectionId, TokenId),
344		_under: TokenId,344		_under: TokenId,
345		_budget: &dyn Budget,345		_nesting_budget: &dyn Budget,
346	) -> sp_runtime::DispatchResult {346	) -> sp_runtime::DispatchResult {
347		fail!(<Error<T>>::RefungibleDisallowsNesting)347		fail!(<Error<T>>::RefungibleDisallowsNesting)
348	}348	}