Switch to wasm-builder 1.0.7 (paritytech#441)

* Switch to `wasm-builder` 1.0.7

runtime/Cargo.toml

@@ -60,7 +60,7 @@ trie-db = "0.15"
 serde_json = "1.0"
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.2" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.3" }
 
 [features]
 default = ["std"]

runtime/build.rs

@@ -17,5 +17,5 @@
 use wasm_builder_runner::{build_current_project, WasmBuilderSource};
 
 fn main() {
-	build_current_project("wasm_binary.rs", WasmBuilderSource::Crates("1.0.5"));
+	build_current_project("wasm_binary.rs", WasmBuilderSource::Crates("1.0.7"));
 }

test-parachains/adder/Cargo.toml

@@ -7,23 +7,17 @@ edition = "2018"
 build = "build.rs"
 
 [dependencies]
-parachain = { package = "polkadot-parachain", path = "../../parachain/", default-features = false }
+parachain = { package = "polkadot-parachain", path = "../../parachain/", default-features = false, features = [ "wasm-api" ] }
 codec = { package = "parity-scale-codec", version = "~1.0.0", default-features = false, features = ["derive"] }
 tiny-keccak = "1.5.0"
-dlmalloc = { version = "0.1.3", features = ["global"], optional = true }
+dlmalloc = { version = "0.1.3", features = [ "global" ] }
 
 # We need to make sure the global allocator is disabled until we have support of full substrate externalities
-rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false, features = [ "no_global_allocator" ] }
 
 [build-dependencies]
 wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.2" }
 
 [features]
 default = [ "std" ]
-no_std = [
-	# We need to make sure the global allocator is disabled until we have support of full substrate externalities
-	"rstd/no_global_allocator",
-	"parachain/wasm-api",
-	"dlmalloc",
-]
 std = []

test-parachains/adder/build.rs

@@ -16,10 +16,12 @@
 
 use wasm_builder_runner::{build_current_project_with_rustflags, WasmBuilderSource};
 
+use std::env;
+
 fn main() {
 	build_current_project_with_rustflags(
 		"wasm_binary.rs",
-		WasmBuilderSource::Crates("1.0.5"),
+		WasmBuilderSource::Crates("1.0.7"),
 		"-C link-arg=--import-memory",
 	);
 }

test-parachains/adder/src/lib.rs

@@ -18,14 +18,14 @@
 
 #![no_std]
 
-#![cfg_attr(feature = "no_std", feature(core_intrinsics, lang_items, core_panic_info, alloc_error_handler))]
+#![cfg_attr(not(feature = "std"), feature(core_intrinsics, lang_items, core_panic_info, alloc_error_handler))]
 
 use codec::{Encode, Decode};
 
-#[cfg(feature = "no_std")]
+#[cfg(not(feature = "std"))]
 mod wasm_validation;
 
-#[cfg(feature = "no_std")]
+#[cfg(not(feature = "std"))]
 #[global_allocator]
 static ALLOC: dlmalloc::GlobalDlmalloc = dlmalloc::GlobalDlmalloc;
 
@@ -46,7 +46,7 @@ pub struct HeadData {
 
 impl HeadData {
 	pub fn hash(&self) -> [u8; 32] {
-		::tiny_keccak::keccak256(&self.encode())
+		tiny_keccak::keccak256(&self.encode())
 	}
 }
 
@@ -60,7 +60,7 @@ pub struct BlockData {
 }
 
 pub fn hash_state(state: u64) -> [u8; 32] {
-	::tiny_keccak::keccak256(state.encode().as_slice())
+	tiny_keccak::keccak256(state.encode().as_slice())
 }
 
 #[derive(Default, Encode, Decode)]

test-parachains/halt/Cargo.toml

@@ -9,9 +9,8 @@ build = "build.rs"
 [dependencies]
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.2" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.3" }
 
 [features]
 default = [ "std" ]
-no_std = []
 std = []

test-parachains/halt/build.rs

@@ -19,7 +19,7 @@ use wasm_builder_runner::{build_current_project_with_rustflags, WasmBuilderSourc
 fn main() {
 	build_current_project_with_rustflags(
 		"wasm_binary.rs",
-		WasmBuilderSource::Crates("1.0.5"),
+		WasmBuilderSource::Crates("1.0.7"),
 		"-C link-arg=--import-memory",
 	);
 }

test-parachains/halt/src/lib.rs

@@ -17,13 +17,13 @@
 //! Basic parachain that executes forever.
 
 #![no_std]
-#![cfg_attr(feature = "no_std", feature(core_intrinsics, lang_items, core_panic_info, alloc_error_handler))]
+#![cfg_attr(not(feature = "std"), feature(core_intrinsics, lang_items, core_panic_info, alloc_error_handler))]
 
 // Make the WASM binary available.
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-#[cfg(feature = "no_std")]
+#[cfg(not(feature = "std"))]
 #[panic_handler]
 #[no_mangle]
 pub fn panic(_info: &core::panic::PanicInfo) -> ! {
@@ -32,7 +32,7 @@ pub fn panic(_info: &core::panic::PanicInfo) -> ! {
 	}
 }
 
-#[cfg(feature = "no_std")]
+#[cfg(not(feature = "std"))]
 #[alloc_error_handler]
 #[no_mangle]
 pub fn oom(_: core::alloc::Layout) -> ! {
@@ -41,7 +41,7 @@ pub fn oom(_: core::alloc::Layout) -> ! {
 	}
 }
 
-#[cfg(feature = "no_std")]
+#[cfg(not(feature = "std"))]
 #[no_mangle]
 pub extern fn validate_block(params: *const u8, len: usize) -> usize {
 	loop {}