mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-27 01:07:57 +00:00
Safe and sane multi-item storage removal (#11490)
* Fix overlay prefix removal result * Second part of the overlay prefix removal fix. * Report only items deleted from storage in clear_prefix * Fix kill_prefix * Formatting * Remove unused code * Fixes * Fixes * Introduce clear_prefix host function v3 * Formatting * Use v2 for now * Fixes * Formatting * Docs * Child prefix removal should also hide v3 for now * Fixes * Fixes * Formatting * Fixes * apply_to_keys_whle takes start_at * apply_to_keys_whle takes start_at * apply_to_keys_whle takes start_at * Cursor API; force limits * Use unsafe deprecated functions * Formatting * Fixes * Grumbles * Fixes * Docs * Some nitpicks 🙈 * Update primitives/externalities/src/lib.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Formatting * Fixes * cargo fmt * Fixes * Update primitives/io/src/lib.rs Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Formatting * Fixes Co-authored-by: Bastian Köcher <info@kchr.de> Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
This commit is contained in:
@@ -27,12 +27,12 @@ use crate::{
|
||||
use codec::{Decode, Encode, MaxEncodedLen};
|
||||
use frame_support::{
|
||||
dispatch::{DispatchError, DispatchResult},
|
||||
storage::child::{self, ChildInfo, KillStorageResult},
|
||||
storage::child::{self, ChildInfo},
|
||||
weights::Weight,
|
||||
};
|
||||
use scale_info::TypeInfo;
|
||||
use sp_core::crypto::UncheckedFrom;
|
||||
use sp_io::hashing::blake2_256;
|
||||
use sp_io::{hashing::blake2_256, KillStorageResult};
|
||||
use sp_runtime::{
|
||||
traits::{Hash, Zero},
|
||||
RuntimeDebug,
|
||||
@@ -266,16 +266,16 @@ where
|
||||
while !queue.is_empty() && remaining_key_budget > 0 {
|
||||
// Cannot panic due to loop condition
|
||||
let trie = &mut queue[0];
|
||||
let outcome =
|
||||
child::kill_storage(&child_trie_info(&trie.trie_id), Some(remaining_key_budget));
|
||||
#[allow(deprecated)]
|
||||
let outcome = child::kill_storage(&child_trie_info(&trie.trie_id), Some(remaining_key_budget));
|
||||
let keys_removed = match outcome {
|
||||
// This happens when our budget wasn't large enough to remove all keys.
|
||||
KillStorageResult::SomeRemaining(count) => count,
|
||||
KillStorageResult::AllRemoved(count) => {
|
||||
KillStorageResult::SomeRemaining(c) => c,
|
||||
KillStorageResult::AllRemoved(c) => {
|
||||
// We do not care to preserve order. The contract is deleted already and
|
||||
// no one waits for the trie to be deleted.
|
||||
queue.swap_remove(0);
|
||||
count
|
||||
c
|
||||
},
|
||||
};
|
||||
remaining_key_budget = remaining_key_budget.saturating_sub(keys_removed);
|
||||
|
||||
Reference in New Issue
Block a user