Merge branch 'master' into ch-ch-trie

core/rpc/src/state/mod.rs

@@ -199,7 +199,8 @@ impl<B, E, Block: BlockT, RA> State<B, E, Block, RA> where
 		for key in keys {
 			let mut last_block = None;
 			let mut last_value = last_values.get(key).cloned().unwrap_or_default();
-			for (block, _) in self.client.key_changes(begin, end, None, key)?.into_iter().rev() {
+			for (block, _) in self.client.key_changes(begin, end, None, key)
+				.map_err(client_err)?.into_iter().rev() {
 				if last_block == Some(block) {
 					continue;
 				}
@@ -290,8 +291,8 @@ impl<B, E, Block, RA> StateApi<Block::Hash> for State<B, E, Block, RA> where
 		let block = self.unwrap_or_best(block)?;
 		trace!(target: "rpc", "Querying child storage at {:?} for key {}", block, HexDisplay::from(&key.0));
 		Ok(self.client
-		   .child_storage(&BlockId::Hash(block), &child_storage_key, &key)
-		   .map_err(client_err)?
+			.child_storage(&BlockId::Hash(block), &child_storage_key, &key)
+			.map_err(client_err)?
 		)
 	}
 
@@ -304,8 +305,8 @@ impl<B, E, Block, RA> StateApi<Block::Hash> for State<B, E, Block, RA> where
 		let block = self.unwrap_or_best(block)?;
 		trace!(target: "rpc", "Querying child storage keys at {:?}", block);
 		Ok(self.client
-		   .child_storage_keys(&BlockId::Hash(block), &child_storage_key, &key_prefix)
-		   .map_err(client_err)?
+			.child_storage_keys(&BlockId::Hash(block), &child_storage_key, &key_prefix)
+			.map_err(client_err)?
 		)
 	}
 
@@ -322,8 +323,8 @@ impl<B, E, Block, RA> StateApi<Block::Hash> for State<B, E, Block, RA> where
 			HexDisplay::from(&key.0),
 		);
 		Ok(self.client
-		   .child_storage_hash(&BlockId::Hash(block), &child_storage_key, &key)
-		   .map_err(client_err)?
+			.child_storage_hash(&BlockId::Hash(block), &child_storage_key, &key)
+			.map_err(client_err)?
 		)
 	}