Fixed panic handling (#1667)

substrate/core/state-machine/src/ext.rs

@@ -181,21 +181,25 @@ where
 	H::Out: Ord + HeapSizeOf,
 {
 	fn storage(&self, key: &[u8]) -> Option<Vec<u8>> {
+		let _guard = panic_handler::AbortGuard::new(true);
 		self.overlay.storage(key).map(|x| x.map(|x| x.to_vec())).unwrap_or_else(||
 			self.backend.storage(key).expect(EXT_NOT_ALLOWED_TO_FAIL))
 	}
 
 	fn storage_hash(&self, key: &[u8]) -> Option<H::Out> {
+		let _guard = panic_handler::AbortGuard::new(true);
 		self.overlay.storage(key).map(|x| x.map(|x| H::hash(x))).unwrap_or_else(||
 			self.backend.storage_hash(key).expect(EXT_NOT_ALLOWED_TO_FAIL))
 	}
 
 	fn child_storage(&self, storage_key: &[u8], key: &[u8]) -> Option<Vec<u8>> {
+		let _guard = panic_handler::AbortGuard::new(true);
 		self.overlay.child_storage(storage_key, key).map(|x| x.map(|x| x.to_vec())).unwrap_or_else(||
 			self.backend.child_storage(storage_key, key).expect(EXT_NOT_ALLOWED_TO_FAIL))
 	}
 
 	fn exists_storage(&self, key: &[u8]) -> bool {
+		let _guard = panic_handler::AbortGuard::new(true);
 		match self.overlay.storage(key) {
 			Some(x) => x.is_some(),
 			_ => self.backend.exists_storage(key).expect(EXT_NOT_ALLOWED_TO_FAIL),
@@ -203,6 +207,7 @@ where
 	}
 
 	fn exists_child_storage(&self, storage_key: &[u8], key: &[u8]) -> bool {
+		let _guard = panic_handler::AbortGuard::new(true);
 		match self.overlay.child_storage(storage_key, key) {
 			Some(x) => x.is_some(),
 			_ => self.backend.exists_child_storage(storage_key, key).expect(EXT_NOT_ALLOWED_TO_FAIL),
@@ -210,6 +215,7 @@ where
 	}
 
 	fn place_storage(&mut self, key: Vec<u8>, value: Option<Vec<u8>>) {
+		let _guard = panic_handler::AbortGuard::new(true);
 		if is_child_storage_key(&key) {
 			warn!(target: "trie", "Refuse to directly set child storage key");
 			return;
@@ -220,6 +226,7 @@ where
 	}
 
 	fn place_child_storage(&mut self, storage_key: Vec<u8>, key: Vec<u8>, value: Option<Vec<u8>>) -> bool {
+		let _guard = panic_handler::AbortGuard::new(true);
 		if !is_child_storage_key(&storage_key) || !is_child_trie_key_valid::<H>(&storage_key) {
 			return false;
 		}
@@ -231,6 +238,7 @@ where
 	}
 
 	fn kill_child_storage(&mut self, storage_key: &[u8]) {
+		let _guard = panic_handler::AbortGuard::new(true);
 		if !is_child_storage_key(storage_key) || !is_child_trie_key_valid::<H>(storage_key) {
 			return;
 		}
@@ -243,6 +251,7 @@ where
 	}
 
 	fn clear_prefix(&mut self, prefix: &[u8]) {
+		let _guard = panic_handler::AbortGuard::new(true);
 		if is_child_storage_key(prefix) {
 			warn!(target: "trie", "Refuse to directly clear prefix that is part of child storage key");
 			return;
@@ -260,6 +269,7 @@ where
 	}
 
 	fn storage_root(&mut self) -> H::Out {
+		let _guard = panic_handler::AbortGuard::new(true);
 		if let Some((_, ref root)) = self.storage_transaction {
 			return root.clone();
 		}
@@ -283,6 +293,7 @@ where
 	}
 
 	fn child_storage_root(&mut self, storage_key: &[u8]) -> Option<Vec<u8>> {
+		let _guard = panic_handler::AbortGuard::new(true);
 		if !is_child_storage_key(storage_key) || !is_child_trie_key_valid::<H>(storage_key) {
 			return None;
 		}
@@ -295,6 +306,7 @@ where
 	}
 
 	fn storage_changes_root(&mut self, parent: H::Out, parent_num: u64) -> Option<H::Out> {
+		let _guard = panic_handler::AbortGuard::new(true);
 		let root_and_tx = compute_changes_trie_root::<_, T, H>(
 			self.backend,
 			self.changes_trie_storage.clone(),