git.delta.rocks / unique-network / refs/commits / 26734e956758

difftreelog

refactor switch to new prefix removal methods

Yaroslav Bolyukin2022-07-21parent: #cdfb9bd.patch.diff
in: master
New methods allows to call `remove_prefix` with limit multiple times
in the same block
However, we don't use prefix removal limits, so upgrade is
straightforward

5 files changed

modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -958,8 +958,8 @@
 		<DestroyedCollectionCount<T>>::put(destroyed_collections);
 		<CollectionById<T>>::remove(collection.id);
 		<AdminAmount<T>>::remove(collection.id);
-		<IsAdmin<T>>::remove_prefix((collection.id,), None);
-		<Allowlist<T>>::remove_prefix((collection.id,), None);
+		let _ = <IsAdmin<T>>::clear_prefix((collection.id,), u32::MAX, None);
+		let _ = <Allowlist<T>>::clear_prefix((collection.id,), u32::MAX, None);
 		<CollectionProperties<T>>::remove(collection.id);
 
 		<Pallet<T>>::deposit_event(Event::CollectionDestroyed(collection.id));
modifiedpallets/fungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -231,8 +231,8 @@
 		PalletCommon::destroy_collection(collection.0, sender)?;
 
 		<TotalSupply<T>>::remove(id);
-		<Balance<T>>::remove_prefix((id,), None);
-		<Allowance<T>>::remove_prefix((id,), None);
+		let _ = <Balance<T>>::clear_prefix((id,), u32::MAX, None);
+		let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);
 		Ok(())
 	}
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -429,13 +429,13 @@
 
 		PalletCommon::destroy_collection(collection.0, sender)?;
 
-		<TokenData<T>>::remove_prefix((id,), None);
-		<TokenChildren<T>>::remove_prefix((id,), None);
-		<Owned<T>>::remove_prefix((id,), None);
+		let _ = <TokenData<T>>::clear_prefix((id,), u32::MAX, None);
+		let _ = <TokenChildren<T>>::clear_prefix((id,), u32::MAX, None);
+		let _ = <Owned<T>>::clear_prefix((id,), u32::MAX, None);
 		<TokensMinted<T>>::remove(id);
 		<TokensBurnt<T>>::remove(id);
-		<Allowance<T>>::remove_prefix((id,), None);
-		<AccountBalance<T>>::remove_prefix((id,), None);
+		let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);
+		let _ = <AccountBalance<T>>::clear_prefix((id,), u32::MAX, None);
 		Ok(())
 	}
 
@@ -487,7 +487,7 @@
 		<TokensBurnt<T>>::insert(collection.id, burnt);
 		<TokenData<T>>::remove((collection.id, token));
 		<TokenProperties<T>>::remove((collection.id, token));
-		<TokenAuxProperties<T>>::remove_prefix((collection.id, token), None);
+		let _ = <TokenAuxProperties<T>>::clear_prefix((collection.id, token), u32::MAX, None);
 		let old_spender = <Allowance<T>>::take((collection.id, token));
 
 		if let Some(old_spender) = old_spender {
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
398398
399		<TokensMinted<T>>::remove(id);399		<TokensMinted<T>>::remove(id);
400		<TokensBurnt<T>>::remove(id);400		<TokensBurnt<T>>::remove(id);
401		<TotalSupply<T>>::remove_prefix((id,), None);401		let _ = <TotalSupply<T>>::clear_prefix((id,), u32::MAX, None);
402		<Balance<T>>::remove_prefix((id,), None);402		let _ = <Balance<T>>::clear_prefix((id,), u32::MAX, None);
403		<Allowance<T>>::remove_prefix((id,), None);403		let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);
404		<Owned<T>>::remove_prefix((id,), None);404		let _ = <Owned<T>>::clear_prefix((id,), u32::MAX, None);
405		<AccountBalance<T>>::remove_prefix((id,), None);405		let _ = <AccountBalance<T>>::clear_prefix((id,), u32::MAX, None);
406		Ok(())406		Ok(())
407	}407	}
408408
424		<TokensBurnt<T>>::insert(collection.id, burnt);424		<TokensBurnt<T>>::insert(collection.id, burnt);
425		<TokenProperties<T>>::remove((collection.id, token_id));425		<TokenProperties<T>>::remove((collection.id, token_id));
426		<TotalSupply<T>>::remove((collection.id, token_id));426		<TotalSupply<T>>::remove((collection.id, token_id));
427<<<<<<< HEAD
427		<Balance<T>>::remove_prefix((collection.id, token_id), None);428		<Balance<T>>::remove_prefix((collection.id, token_id), None);
428		<Allowance<T>>::remove_prefix((collection.id, token_id), None);429		<Allowance<T>>::remove_prefix((collection.id, token_id), None);
429430
435			}436			}
436			.to_log(collection_id_to_address(collection.id)),437			.to_log(collection_id_to_address(collection.id)),
437		);438		);
439=======
440		let _ = <Balance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);
441		let _ = <Allowance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);
442		// TODO: ERC721 transfer event
443>>>>>>> 5d9665e0... refactor: switch to new prefix removal methods
438		Ok(())444		Ok(())
439	}445	}
440446
modifiedpallets/unique/src/lib.rsdiffbeforeafterboth
--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -373,13 +373,16 @@
 
 			T::CollectionDispatch::destroy(sender, collection)?;
 
-			<NftTransferBasket<T>>::remove_prefix(collection_id, None);
-			<FungibleTransferBasket<T>>::remove_prefix(collection_id, None);
-			<ReFungibleTransferBasket<T>>::remove_prefix((collection_id,), None);
+			// TODO: basket cleanup should be moved elsewhere
+			// Maybe runtime dispatch.rs should perform it?
 
-			<NftApproveBasket<T>>::remove_prefix(collection_id, None);
-			<FungibleApproveBasket<T>>::remove_prefix(collection_id, None);
-			<RefungibleApproveBasket<T>>::remove_prefix((collection_id,), None);
+			let _ = <NftTransferBasket<T>>::clear_prefix(collection_id, u32::MAX, None);
+			let _ = <FungibleTransferBasket<T>>::clear_prefix(collection_id, u32::MAX, None);
+			let _ = <ReFungibleTransferBasket<T>>::clear_prefix((collection_id,), u32::MAX, None);
+
+			let _ = <NftApproveBasket<T>>::clear_prefix(collection_id, u32::MAX, None);
+			let _ = <FungibleApproveBasket<T>>::clear_prefix(collection_id, u32::MAX, None);
+			let _ = <RefungibleApproveBasket<T>>::clear_prefix((collection_id,), u32::MAX, None);
 
 			Ok(())
 		}