From 5f48493b9a30ecb8728765d5a94aca1479ad8ad7 Mon Sep 17 00:00:00 2001
From: cheme <emericchevalier.pro@gmail.com>
Date: Mon, 10 Dec 2018 16:24:31 +0100
Subject: [PATCH] Allow spaces in types for decl_storage proc_macro (#1245)

* Do not try to fix type display for metadata in rust.

* Fix test (adding extra space (we can see it as a canary: if at some
point quote got a better output the test will fail and js space removal
could be remove)).
---
 .../srml/support/procedural/src/storage/transformation.rs    | 5 ++---
 substrate/srml/support/src/storage/generator.rs              | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/substrate/srml/support/procedural/src/storage/transformation.rs b/substrate/srml/support/procedural/src/storage/transformation.rs
index 2f11b0dc5f..8887a76f70 100644
--- a/substrate/srml/support/procedural/src/storage/transformation.rs
+++ b/substrate/srml/support/procedural/src/storage/transformation.rs
@@ -49,7 +49,6 @@ macro_rules! try_tok(( $expre : expr ) => {
 pub fn decl_storage_impl(input: TokenStream) -> TokenStream {
 	let def = parse_macro_input!(input as StorageDefinition);
 
-	// old macro naming convention (s replaces $)
 	let StorageDefinition {
 		hidden_crate,
 		visibility,
@@ -578,7 +577,7 @@ fn store_functions_to_metadata (
 		let is_option = extracted_opt.is_some();
 		let typ = extracted_opt.unwrap_or(quote!( #gettype ));
 		let stype = if is_simple {
-			let styp = typ.to_string().replace(" ","");
+			let styp = typ.to_string();
 			quote!{
 				#scrate::storage::generator::StorageFunctionType::Plain(
 					#scrate::storage::generator::DecodeDifferent::Encode(#styp),
@@ -587,7 +586,7 @@ fn store_functions_to_metadata (
 		} else {
 			let kty = stk.expect("is not simple; qed");
 			let kty = quote!(#kty).to_string();
-			let styp = typ.to_string().replace(" ","");
+			let styp = typ.to_string();
 			quote!{
 				#scrate::storage::generator::StorageFunctionType::Map {
 					key: #scrate::storage::generator::DecodeDifferent::Encode(#kty),
diff --git a/substrate/srml/support/src/storage/generator.rs b/substrate/srml/support/src/storage/generator.rs
index 66dcc44387..a3a9395b06 100644
--- a/substrate/srml/support/src/storage/generator.rs
+++ b/substrate/srml/support/src/storage/generator.rs
@@ -677,7 +677,7 @@ mod tests {
 			StorageFunctionMetadata {
 				name: DecodeDifferent::Encode("GETU32"),
 				modifier: StorageFunctionModifier::Default,
-				ty: StorageFunctionType::Plain(DecodeDifferent::Encode("T::Origin")),
+				ty: StorageFunctionType::Plain(DecodeDifferent::Encode("T :: Origin")),
 				documentation: DecodeDifferent::Encode(&[]),
 			},
 			StorageFunctionMetadata {