Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Correctly serialize code in chain spec as hex #4025

Merged
bkchr merged 5 commits into from
Nov 7, 2019
Merged

Correctly serialize code in chain spec as hex #4025

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bcb355f
Correctly serialize code in chain spec as hex.
jimpo Nov 5, 2019
61cd3f0
Remove panic in macro and whitelist attribute types for storage
jimpo Nov 6, 2019
8749bb4
Merge branch 'master' into genesis-code-spec
jimpo Nov 7, 2019
39199bb
Use syn::Error to enforce whitelisted attributes on genesis config.
jimpo Nov 7, 2019
3d01bc4
Blacklist genesis extra config line attributes instead of whitelist.
jimpo Nov 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into genesis-code-spec 
# Conflicts:
#	srml/support/procedural/src/storage/genesis_config/genesis_config_def.rs
  • Loading branch information
@jimpo
jimpo committed Nov 7, 2019
commit 8749bb4511fa7448305503ee567d040dc024bf3c
6 changes: 3 additions & 3 deletions srml/support/procedural/src/storage/genesis_config/genesis_config_def.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ impl GenesisConfigDef {

for line in &def.extra_genesis_config_lines {
let attrs = line.attrs.iter()
.filter_map(|a| a.parse_meta().ok())
.filter(|m| m.name() == "doc" || m.name() == "serde")
.collect();
.filter_map(|a| a.parse_meta().ok())
.filter(|m| m.path().is_ident("doc") || m.path().is_ident("serde"))
.collect();

let default = line.default.as_ref().map(|e| quote!( #e ))
.unwrap_or_else(|| quote!( Default::default() ));
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.