pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-27 15:07:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve fees module (#1821)

Browse Source 
* remove amount associated
* make a new trait to bound some arithmetics to balances or assets:
  It also remove arithmetic bounds of srml-support::traits::Currency.

  To update your code then use srml_support::traits::ArithmeticType like:
  `type Currency: ArithmeticType + Currency<Self::AccountId, Balance=BalanceOf<Self>>; ` 
  with `type BalanceOf<T> = <<T as Trait>::Currency as ArithmeticType>::Type; `

* improve decl_storage when it explicit serde bound: basically don't try to be smarter than rust and just use where clause.
This commit is contained in:
thiolliere
2019-02-19 17:13:59 +01:00
committed by GitHub
parent 9a2f1b2007
commit 8065116ba5
16 changed files with 48 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/srml/support/procedural/tools/src/syn_ext.rs
-54
View File
@@ -327,57 +327,3 @@ pub fn has_parametric_type_def(typ: &syn::Type, ident: &Ident, default: bool) ->
pub fn has_parametric_type(typ: &syn::Type, ident: &Ident) -> bool {
has_parametric_type_def(typ, ident, true)
}
/// Get case where serde does not include bound with serde_derive macros:
/// see https://github.com/serde-rs/serde/issues/1454
pub fn get_non_bound_serde_derive_types(typ: &syn::Type, t: &syn::Ident) -> Vec<syn::Type> {
let mut result = Vec::new();
get_non_bound_serde_derive_types_inner(typ, t, &mut result);
result
}
fn get_non_bound_serde_derive_types_inner(typ: &syn::Type, t: &syn::Ident, result: &mut Vec<syn::Type>) {
match *typ {
syn::Type::Path(ref path) => {
if heuristic_is_associated_path(&path.path,t) {
result.push(typ.clone());
}
for p in path.path.segments.iter() {
if let syn::PathArguments::AngleBracketed(ref args) = p.arguments {
for a in args.args.iter() {
if let syn::GenericArgument::Type(ref ty) = a {
get_non_bound_serde_derive_types_inner(ty, t, result)
}
}
}
}
},
syn::Type::Slice(ref inner) => get_non_bound_serde_derive_types_inner(&inner.elem, t, result),
syn::Type::Array(ref inner) => get_non_bound_serde_derive_types_inner(&inner.elem, t, result),
syn::Type::Ptr(ref inner) => get_non_bound_serde_derive_types_inner(&inner.elem, t, result),
syn::Type::Reference(ref inner) => get_non_bound_serde_derive_types_inner(&inner.elem, t, result),
syn::Type::BareFn(..) => (),
syn::Type::Never(..) => (),
syn::Type::Tuple(ref inner) => for e in inner.elems.iter() {
get_non_bound_serde_derive_types_inner(e, t, result)
},
syn::Type::TraitObject(..) => (),
syn::Type::ImplTrait(..) => (),
syn::Type::Paren(ref inner) => get_non_bound_serde_derive_types_inner(&inner.elem, t, result),
syn::Type::Group(ref inner) => get_non_bound_serde_derive_types_inner(&inner.elem, t, result),
syn::Type::Infer(..) => (),
syn::Type::Macro(..) => (),
syn::Type::Verbatim(..) => (),
}
}
fn heuristic_is_associated_path(path: &syn::Path,t: &syn::Ident) -> bool {
if let Some(syn::punctuated::Pair::Punctuated(s,_)) = path.segments.first() {
&s.ident == t
} else {
false
}
}