Build WASM binaries as part of cargo build

.gitlab-ci.yml

@@ -114,7 +114,6 @@ test-linux-stable:                 &test-linux
     variables:
       - $DEPLOY_TAG
   script:
-    - ./scripts/build.sh --locked
     - time cargo test --all --release --verbose --locked
     - sccache -s
 
@@ -126,7 +125,6 @@ test-linux-stable-int:
     variables:
       - $DEPLOY_TAG
   script:
-    - ./scripts/build.sh --locked
     - time RUST_LOG=sync=trace,consensus=trace,client=trace,state-db=trace,db=trace,forks=trace,state_db=trace,storage_cache=trace 
         cargo test -p node-cli --release --verbose --locked -- --ignored --test-threads=1
     - sccache -s
@@ -181,7 +179,6 @@ build-linux-release:
     variables:
       - $DEPLOY_TAG
   script:
-    - ./scripts/build.sh --locked
     - time cargo build --release --verbose
     - mkdir -p ./artifacts
     - mv ./target/release/substrate ./artifacts/.
@@ -211,7 +208,6 @@ build-rust-doc-release:
     - ./crate-docs
   <<:                              *build-only
   script:
-    - ./scripts/build.sh --locked
     - rm -f ./crate-docs/index.html # use it as an indicator if the job succeeds
     - time cargo +nightly doc --release --all --verbose
     - cp -R ./target/doc ./crate-docs

Cargo.toml

@@ -28,6 +28,7 @@ members = [
 	"core/consensus/rhd",
 	"core/consensus/slots",
 	"core/executor",
+	"core/executor/runtime-test",
 	"core/finality-grandpa",
 	"core/finality-grandpa/primitives",
 	"core/inherents",
@@ -55,7 +56,9 @@ members = [
 	"core/transaction-pool",
 	"core/transaction-pool/graph",
 	"core/trie",
-	"core/util/fork-tree",
+	"core/utils/fork-tree",
+	"core/utils/wasm-builder",
+	"core/utils/wasm-builder-runner",
 	"srml/support",
 	"srml/support/procedural",
 	"srml/support/procedural/tools",
@@ -89,11 +92,6 @@ members = [
 	"subkey",
 	"test-utils/chain-spec-builder",
 ]
-exclude = [
-	"node/runtime/wasm",
-	"core/executor/wasm",
-	"core/test-runtime/wasm",
-]
 
 [badges]
 travis-ci = { repository = "paritytech/substrate", branch = "master" }

core/consensus/babe/src/lib.rs

@@ -970,7 +970,7 @@ mod tests {
 			.map(drop)
 			.map_err(drop);
 
-		runtime.block_on(wait_for.select(drive_to_completion).map_err(drop)).unwrap();
+		let _ = runtime.block_on(wait_for.select(drive_to_completion).map_err(drop)).unwrap();
 	}
 
 	#[test]

core/executor/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-derive_more = "0.14.0"
+derive_more = "0.15.0"
 parity-codec = "3.3"
 runtime_io = { package = "sr-io", path = "../sr-io" }
 primitives = { package = "substrate-primitives", path = "../primitives" }
@@ -15,8 +15,8 @@ state_machine = { package = "substrate-state-machine", path = "../state-machine"
 runtime_version = { package = "sr-version", path = "../sr-version" }
 panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" }
 wasmi = { version = "0.4.3" }
-byteorder = "1.1"
-lazy_static = "1.0"
+byteorder = "1.3"
+lazy_static = "1.3"
 parking_lot = "0.8.0"
 log = "0.4"
 libsecp256k1 = "0.2.1"
@@ -26,6 +26,7 @@ tiny-keccak = "1.4.2"
 assert_matches = "1.1"
 wabt = "~0.7.4"
 hex-literal = "0.2.0"
+runtime-test = { package = "substrate-runtime-test", path = "runtime-test" }
 
 [features]
 default = []

core/executor/wasm/Cargo.toml → core/executor/runtime-test/Cargo.toml

@@ -1,20 +1,19 @@
 [package]
-name = "runtime-test"
+name = "substrate-runtime-test"
 version = "2.0.0"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
-
-[lib]
-crate-type = ["cdylib"]
+build = "build.rs"
 
 [dependencies]
 runtime_io = { package = "sr-io", path = "../../sr-io", default-features = false }
 sandbox = { package = "sr-sandbox", path = "../../sr-sandbox", default-features = false }
 substrate-primitives = { path = "../../primitives", default-features = false }
 
-[profile.release]
-panic = "abort"
-lto = true
+[build-dependencies]
+wasm-builder-runner = { path = "../../utils/wasm-builder-runner" }
 
-[workspace]
-members = []
+[features]
+default = [ "std" ]
+std = []
+no_std = []

node/runtime/wasm/src/lib.rs → core/executor/runtime-test/build.rs

@@ -1,4 +1,4 @@
-// Copyright 2018-2019 Parity Technologies (UK) Ltd.
+// Copyright 2019 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
@@ -14,8 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-//! The Substrate runtime reexported for WebAssembly compile.
-
-#![cfg_attr(not(feature = "std"), no_std)]
-
-pub use node_runtime::*;
+fn main() {
+	wasm_builder_runner::build_current_project(
+		"wasm_binary.rs",
+		"../../utils/wasm-builder",
+	);
+}

core/executor/wasm/src/lib.rs → core/executor/runtime-test/src/lib.rs

@@ -1,6 +1,10 @@
 #![no_std]
 #![cfg_attr(feature = "strict", deny(warnings))]
 
+// Make the WASM binary available.
+#[cfg(feature = "std")]
+include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
+
 extern crate alloc;
 use alloc::vec::Vec;
 use alloc::slice;