From d04d24d0476821c7523711bf269db3ff24693d63 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 30 Oct 2019 20:54:22 +0100 Subject: [PATCH] Fix compiling substrate-chain-spec for WASM (#3971) * Fix compiling substrate-chain-spec for WASM * Fix tests --- substrate/.gitlab-ci.yml | 1 + substrate/core/chain-spec/Cargo.toml | 2 +- substrate/core/chain-spec/src/extension.rs | 2 +- substrate/core/chain-spec/src/lib.rs | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/substrate/.gitlab-ci.yml b/substrate/.gitlab-ci.yml index 5cb8db916e..1b944157fe 100644 --- a/substrate/.gitlab-ci.yml +++ b/substrate/.gitlab-ci.yml @@ -196,6 +196,7 @@ check-web-wasm: - time cargo web build -p sr-io - time cargo web build -p sr-primitives - time cargo web build -p sr-std + - time cargo web build -p substrate-chain-spec - time cargo web build -p substrate-client - time cargo web build -p substrate-consensus-aura - time cargo web build -p substrate-consensus-babe diff --git a/substrate/core/chain-spec/Cargo.toml b/substrate/core/chain-spec/Cargo.toml index 1a3c56affb..b4d9d004e4 100644 --- a/substrate/core/chain-spec/Cargo.toml +++ b/substrate/core/chain-spec/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -chain-spec-derive = { package = "substrate-chain-spec-derive", path = "./derive" } +substrate-chain-spec-derive = { path = "./derive" } impl-trait-for-tuples = "0.1.2" network = { package = "substrate-network", path = "../../core/network" } primitives = { package = "substrate-primitives", path = "../primitives" } diff --git a/substrate/core/chain-spec/src/extension.rs b/substrate/core/chain-spec/src/extension.rs index bf98ced04d..e5110a77d5 100644 --- a/substrate/core/chain-spec/src/extension.rs +++ b/substrate/core/chain-spec/src/extension.rs @@ -253,7 +253,7 @@ impl Extension for Forks where #[cfg(test)] mod tests { use super::*; - use chain_spec_derive::{ChainSpecGroup, ChainSpecExtension}; + use substrate_chain_spec_derive::{ChainSpecGroup, ChainSpecExtension}; // Make the proc macro work for tests and doc tests. use crate as substrate_chain_spec; diff --git a/substrate/core/chain-spec/src/lib.rs b/substrate/core/chain-spec/src/lib.rs index 705be998b7..8c35c22d9b 100644 --- a/substrate/core/chain-spec/src/lib.rs +++ b/substrate/core/chain-spec/src/lib.rs @@ -113,7 +113,7 @@ mod extension; pub use chain_spec::{ChainSpec, Properties, NoExtension}; pub use extension::{Group, Fork, Forks, Extension}; -pub use chain_spec_derive::{ChainSpecExtension, ChainSpecGroup}; +pub use substrate_chain_spec_derive::{ChainSpecExtension, ChainSpecGroup}; use serde::{Serialize, de::DeserializeOwned}; use sr_primitives::BuildStorage;