Companion for #9106 (remove_all with size limit) (#3257)

* update apis

* fix api

* rename to `KillStorageResult`

* update Substrate

Co-authored-by: parity-processbot <>
This commit is contained in:
Shawn Tabrizi
2021-06-15 14:52:54 +01:00
committed by GitHub
parent 396b38b355
commit da71128daf
4 changed files with 166 additions and 166 deletions
+161 -161
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -118,11 +118,11 @@ impl sp_externalities::Externalities for ValidationExternalities {
panic!("kill_child_storage: unsupported feature for parachain validation") panic!("kill_child_storage: unsupported feature for parachain validation")
} }
fn clear_prefix(&mut self, _: &[u8]) { fn clear_prefix(&mut self, _: &[u8], _: Option<u32>) -> (bool, u32) {
panic!("clear_prefix: unsupported feature for parachain validation") panic!("clear_prefix: unsupported feature for parachain validation")
} }
fn clear_child_prefix(&mut self, _: &ChildInfo, _: &[u8]) { fn clear_child_prefix(&mut self, _: &ChildInfo, _: &[u8], _: Option<u32>) -> (bool, u32) {
panic!("clear_child_prefix: unsupported feature for parachain validation") panic!("clear_child_prefix: unsupported feature for parachain validation")
} }
+2 -2
View File
@@ -296,7 +296,7 @@ pub mod pallet {
for ((bidder, _), amount) in ReservedAmounts::<T>::drain() { for ((bidder, _), amount) in ReservedAmounts::<T>::drain() {
CurrencyOf::<T>::unreserve(&bidder, amount); CurrencyOf::<T>::unreserve(&bidder, amount);
} }
Winning::<T>::remove_all(); Winning::<T>::remove_all(None);
AuctionInfo::<T>::kill(); AuctionInfo::<T>::kill();
Ok(()) Ok(())
} }
@@ -511,7 +511,7 @@ impl<T: Config> Pallet<T> {
let res = Winning::<T>::get(offset).unwrap_or([Self::EMPTY; SlotRange::SLOT_RANGE_COUNT]); let res = Winning::<T>::get(offset).unwrap_or([Self::EMPTY; SlotRange::SLOT_RANGE_COUNT]);
// This `remove_all` statement should remove at most `EndingPeriod` / `SampleLength` items, // This `remove_all` statement should remove at most `EndingPeriod` / `SampleLength` items,
// which should be bounded and sensibly configured in the runtime. // which should be bounded and sensibly configured in the runtime.
Winning::<T>::remove_all(); Winning::<T>::remove_all(None);
AuctionInfo::<T>::kill(); AuctionInfo::<T>::kill();
return Some((res, lease_period_index)) return Some((res, lease_period_index))
} }
+1 -1
View File
@@ -677,7 +677,7 @@ impl<T: Config> Pallet<T> {
who.using_encoded(|b| child::kill(&Self::id_from_index(index), b)); who.using_encoded(|b| child::kill(&Self::id_from_index(index), b));
} }
pub fn crowdloan_kill(index: TrieIndex) -> child::KillChildStorageResult { pub fn crowdloan_kill(index: TrieIndex) -> child::KillStorageResult {
child::kill_storage(&Self::id_from_index(index), Some(T::RemoveKeysLimit::get())) child::kill_storage(&Self::id_from_index(index), Some(T::RemoveKeysLimit::get()))
} }