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

* update apis

* fix api

* rename to `KillStorageResult`

* update Substrate

Co-authored-by: parity-processbot <>

polkadot/node/core/pvf/src/executor_intf.rs

@@ -118,11 +118,11 @@ impl sp_externalities::Externalities for ValidationExternalities {
 		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")
 	}
 
-	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")
 	}
 

polkadot/runtime/common/src/auctions.rs

@@ -296,7 +296,7 @@ pub mod pallet {
 			for ((bidder, _), amount) in ReservedAmounts::<T>::drain() {
 				CurrencyOf::<T>::unreserve(&bidder, amount);
 			}
-			Winning::<T>::remove_all();
+			Winning::<T>::remove_all(None);
 			AuctionInfo::<T>::kill();
 			Ok(())
 		}
@@ -511,7 +511,7 @@ impl<T: Config> Pallet<T> {
 					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,
 					// which should be bounded and sensibly configured in the runtime.
-					Winning::<T>::remove_all();
+					Winning::<T>::remove_all(None);
 					AuctionInfo::<T>::kill();
 					return Some((res, lease_period_index))
 				}

polkadot/runtime/common/src/crowdloan.rs

@@ -677,7 +677,7 @@ impl<T: Config> Pallet<T> {
 		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()))
 	}