difftreelog
fix(rft) conflicts
in: master
1 file changed
pallets/refungible/src/lib.rsdiffbeforeafterboth424 <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<<<<<<< HEAD428 <Balance<T>>::remove_prefix((collection.id, token_id), None);427 let _ = <Balance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);429 <Allowance<T>>::remove_prefix((collection.id, token_id), None);428 let _ = <Allowance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);430431 <PalletEvm<T>>::deposit_log(429 <PalletEvm<T>>::deposit_log(432 ERC721Events::Transfer {430 ERC721Events::Transfer {436 }434 }437 .to_log(collection_id_to_address(collection.id)),435 .to_log(collection_id_to_address(collection.id)),438 );436 );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 event443>>>>>>> 5d9665e0... refactor: switch to new prefix removal methods444 Ok(())437 Ok(())445 }438 }446439