Revert "Don't include :code by default in storage proofs (#5060)" (#5136)

This reverts commit 6ee39261c8.

substrate/client/network/src/chain.rs

@@ -62,12 +62,7 @@ pub trait Client<Block: BlockT>: Send + Sync {
 	) -> Result<StorageProof, Error>;
 
 	/// Get method execution proof.
-	fn execution_proof(
-		&self,
-		block: &Block::Hash,
-		method: &str,
-		data: &[u8],
-	) -> Result<(Vec<u8>, StorageProof), Error>;
+	fn execution_proof(&self, block: &Block::Hash, method: &str, data: &[u8]) -> Result<(Vec<u8>, StorageProof), Error>;
 
 	/// Get key changes proof.
 	fn key_changes_proof(
@@ -157,7 +152,11 @@ impl<B, E, Block, RA> Client<Block> for SubstrateClient<B, E, Block, RA> where
 		method: &str,
 		data: &[u8],
 	) -> Result<(Vec<u8>, StorageProof), Error> {
-		SubstrateClient::execution_proof(self, &BlockId::Hash(block.clone()), method, data)
+		(self as &SubstrateClient<B, E, Block, RA>).execution_proof(
+			&BlockId::Hash(block.clone()),
+			method,
+			data,
+		)
 	}
 
 	fn key_changes_proof(
@@ -169,14 +168,7 @@ impl<B, E, Block, RA> Client<Block> for SubstrateClient<B, E, Block, RA> where
 		storage_key: Option<&StorageKey>,
 		key: &StorageKey,
 	) -> Result<ChangesProof<Block::Header>, Error> {
-		(self as &SubstrateClient<B, E, Block, RA>).key_changes_proof(
-			first,
-			last,
-			min,
-			max,
-			storage_key,
-			key,
-		)
+		(self as &SubstrateClient<B, E, Block, RA>).key_changes_proof(first, last, min, max, storage_key, key)
 	}
 
 	fn is_descendent_of(&self, base: &Block::Hash, block: &Block::Hash) -> Result<bool, Error> {

substrate/client/network/src/protocol/light_client_handler.rs

@@ -254,12 +254,13 @@ where
 	B: Block,
 {
 	/// Construct a new light client handler.
-	pub fn new(
-		cfg: Config,
-		chain: Arc<dyn Client<B>>,
-		checker: Arc<dyn fetcher::FetchChecker<B>>,
-		peerset: sc_peerset::PeersetHandle,
-	) -> Self {
+	pub fn new
+		( cfg: Config
+		, chain: Arc<dyn Client<B>>
+		, checker: Arc<dyn fetcher::FetchChecker<B>>
+		, peerset: sc_peerset::PeersetHandle
+		) -> Self
+	{
 		LightClientHandler {
 			config: cfg,
 			chain,
@@ -424,8 +425,7 @@ where
 		log::trace!("remote call request from {} ({} at {:?})",
 			peer,
 			request.method,
-			request.block,
-		);
+			request.block);
 
 		let block = Decode::decode(&mut request.block.as_ref())?;
 
@@ -436,8 +436,7 @@ where
 					peer,
 					request.method,
 					request.block,
-					e,
-				);
+					e);
 				StorageProof::empty()
 			}
 		};

substrate/client/network/src/protocol/light_dispatch.rs

@@ -750,11 +750,7 @@ pub mod tests {
 			}
 		}
 
-		fn check_execution_proof(
-			&self,
-			_: &RemoteCallRequest<B::Header>,
-			_: StorageProof,
-		) -> ClientResult<Vec<u8>> {
+		fn check_execution_proof(&self, _: &RemoteCallRequest<B::Header>, _: StorageProof) -> ClientResult<Vec<u8>> {
 			match self.ok {
 				true => Ok(vec![42]),
 				false => Err(ClientError::Backend("Test error".into())),