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

difftreelog

rename: budget to nesting_budget

Daniel Shiposha2022-07-04parent: #2ad114b.patch.diff
in: master

4 files changed

modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- 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));
modifiedpallets/fungible/src/common.rsdiffbeforeafterboth
--- 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)
 	}
modifiedpallets/nonfungible/src/common.rsdiffbeforeafterboth
220 sender: T::CrossAccountId,220 sender: T::CrossAccountId,
221 token_id: TokenId,221 token_id: TokenId,
222 properties: Vec<Property>,222 properties: Vec<Property>,
223 budget: &dyn Budget,223 nesting_budget: &dyn Budget,
224 ) -> DispatchResultWithPostInfo {224 ) -> DispatchResultWithPostInfo {
225 let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);225 let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);
226226
227 with_weight(227 with_weight(
228 <Pallet<T>>::set_token_properties(self, &sender, token_id, properties, false, budget),228 <Pallet<T>>::set_token_properties(self, &sender, token_id, properties, false, nesting_budget),
229 weight,229 weight,
230 )230 )
231 }231 }
235 sender: T::CrossAccountId,235 sender: T::CrossAccountId,
236 token_id: TokenId,236 token_id: TokenId,
237 property_keys: Vec<PropertyKey>,237 property_keys: Vec<PropertyKey>,
238 budget: &dyn Budget,238 nesting_budget: &dyn Budget,
239 ) -> DispatchResultWithPostInfo {239 ) -> DispatchResultWithPostInfo {
240 let weight = <CommonWeights<T>>::delete_token_properties(property_keys.len() as u32);240 let weight = <CommonWeights<T>>::delete_token_properties(property_keys.len() as u32);
241241
242 with_weight(242 with_weight(
243 <Pallet<T>>::delete_token_properties(self, &sender, token_id, property_keys, budget),243 <Pallet<T>>::delete_token_properties(self, &sender, token_id, property_keys, nesting_budget),
244 weight,244 weight,
245 )245 )
246 }246 }
370 sender: T::CrossAccountId,370 sender: T::CrossAccountId,
371 from: (CollectionId, TokenId),371 from: (CollectionId, TokenId),
372 under: TokenId,372 under: TokenId,
373 budget: &dyn Budget,373 nesting_budget: &dyn Budget,
374 ) -> sp_runtime::DispatchResult {374 ) -> sp_runtime::DispatchResult {
375 <Pallet<T>>::check_nesting(self, sender, from, under, budget)375 <Pallet<T>>::check_nesting(self, sender, from, under, nesting_budget)
376 }376 }
377377
378 fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId)) {378 fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId)) {
modifiedpallets/refungible/src/common.rsdiffbeforeafterboth
--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -314,7 +314,7 @@
 		_sender: T::CrossAccountId,
 		_token_id: TokenId,
 		_property: Vec<Property>,
-		_budget: &dyn Budget,
+		_nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		fail!(<Error<T>>::SettingPropertiesNotAllowed)
 	}
@@ -332,7 +332,7 @@
 		_sender: T::CrossAccountId,
 		_token_id: TokenId,
 		_property_keys: Vec<PropertyKey>,
-		_budget: &dyn Budget,
+		_nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		fail!(<Error<T>>::SettingPropertiesNotAllowed)
 	}
@@ -342,7 +342,7 @@
 		_sender: <T>::CrossAccountId,
 		_from: (CollectionId, TokenId),
 		_under: TokenId,
-		_budget: &dyn Budget,
+		_nesting_budget: &dyn Budget,
 	) -> sp_runtime::DispatchResult {
 		fail!(<Error<T>>::RefungibleDisallowsNesting)
 	}