pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 09:21:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Temporary fix for serde issue (#1511)

Browse Source 
* Generate serde bound instead of relying on serde_derive.

* remove comment
This commit is contained in:
cheme
2019-01-21 19:23:22 +01:00
committed by Gav Wood
parent 7ccd294de4
commit 8ec759d32e
3 changed files with 89 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/srml/support/procedural/src/storage/transformation.rs
+34
View File
@@ -154,6 +154,7 @@ fn decl_store_extra_genesis(
let mut is_trait_needed = false;
let mut has_trait_field = false;
let mut serde_complete_bound = std::collections::HashSet::new();
let mut config_field = TokenStream2::new();
let mut config_field_default = TokenStream2::new();
let mut builders = TokenStream2::new();
@@ -184,6 +185,14 @@ fn decl_store_extra_genesis(
is_trait_needed = true;
has_trait_field = true;
}
for t in ext::get_non_bound_serde_derive_types(type_infos.full_type, &traitinstance).into_iter() {
serde_complete_bound.insert(t);
}
if let Some(kt) = type_infos.map_key {
for t in ext::get_non_bound_serde_derive_types(kt, &traitinstance).into_iter() {
serde_complete_bound.insert(t);
}
}
let storage_type = type_infos.typ.clone();
config_field.extend(quote!( pub #ident: #storage_type, ));
opt_build = Some(build.as_ref().map(|b| &b.expr.content).map(|b|quote!( #b ))
@@ -246,6 +255,11 @@ fn decl_store_extra_genesis(
is_trait_needed = true;
has_trait_field = true;
}
for t in ext::get_non_bound_serde_derive_types(extra_type, &traitinstance).into_iter() {
serde_complete_bound.insert(t);
}
let extrafield = &extra_field.content;
genesis_extrafields.extend(quote!{
#attrs pub #extrafield: #extra_type,
@@ -268,6 +282,25 @@ fn decl_store_extra_genesis(
}
}
let serde_bug_bound = if serde_complete_bound.len() > 0 {
let mut b_ser = String::new();
let mut b_dser = String::new();
for bound in serde_complete_bound {
let stype = quote!(#bound);
b_ser += &(stype.to_string() + " : " + &scrate.to_string() + "::serde::Serialize, ");
b_dser += &(stype.to_string() + " : " + &scrate.to_string() + "::serde::de::DeserializeOwned, ");
}
quote! {
#[serde(bound(serialize = #b_ser))]
#[serde(bound(deserialize = #b_dser))]
}
} else {
quote!()
};
let is_extra_genesis_needed = has_scall
|| !config_field.is_empty()
|| !genesis_extrafields.is_empty()
@@ -307,6 +340,7 @@ fn decl_store_extra_genesis(
#[cfg(feature = "std")]
#[serde(rename_all = "camelCase")]
#[serde(deny_unknown_fields)]
#serde_bug_bound
pub struct GenesisConfig#fparam {
#ph_field
#config_field