Fix everything.

substrate/executor/src/native_executor.rs

@@ -213,7 +213,7 @@ mod tests {
 		construct_block(
 			2,
 			block1().1,
-			hex!("e2ba57cfb94b870ea6670b012b49dc33cbb70e3aa8d36cf54dfa5e4e69cd0778").into(),
+			hex!("1feb4d3a2e587079e6ce1685fa79994efd995e33cb289d39cded67aac1bb46a9").into(),
 			vec![
 				Transaction {
 					signed: two(),

substrate/primitives/Cargo.toml

@@ -11,7 +11,7 @@ fixed-hash = { git = "https://github.com/rphmeier/primitives.git", branch = "com
 rustc-hex = { git = "https://github.com/rphmeier/rustc-hex.git", version = "2.0", default_features = false }
 serde = { version = "1.0", default_features = false }
 serde_derive = { version = "1.0", optional = true }
-uint = { git = "https://github.com/rphmeier/primitives.git", branch = "compile-for-wasm" }
+uint = { git = "https://github.com/rphmeier/primitives.git", branch = "compile-for-wasm", default_features = false }
 twox-hash = { version = "1.1.0", optional = true }
 byteorder = { version = "1.1", default_features = false }
 blake2-rfc = { version = "0.2.18", optional = true }

substrate/runtime-io/Cargo.toml

@@ -10,7 +10,7 @@ rustc_version = "0.2"
 [dependencies]
 pwasm-alloc = { path = "../wasm-runtime/pwasm-alloc" }
 pwasm-libc = { path = "../wasm-runtime/pwasm-libc" }
-substrate-runtime-std = { path = "../runtime-std" }
+substrate-runtime-std = { path = "../runtime-std", default_features = false }
 environmental = { path = "../environmental", optional = true }
 substrate-state-machine = { path = "../state-machine", optional = true }
 substrate-primitives = { path = "../primitives", default_features = false }

substrate/wasm-runtime/polkadot/src/lib.rs

@@ -25,9 +25,6 @@ extern crate substrate_runtime_io as runtime_io;
 
 #[cfg(feature = "std")]
 extern crate rustc_hex;
-#[cfg(feature = "with-std")]
-#[macro_use]
-extern crate log;
 
 extern crate substrate_codec as codec;
 extern crate substrate_primitives;

substrate/wasm-runtime/polkadot/src/runtime/system.rs

@@ -202,15 +202,15 @@ fn post_finalise(header: &Header) {
 	storage::put(&header.number.to_keyed_vec(BLOCK_HASH_AT), &header.blake2_256());
 }
 
-#[cfg(feature = "with-std")]
+#[cfg(feature = "std")]
 fn info_expect_equal_hash(given: &Hash, expected: &Hash) {
 	use support::HexDisplay;
 	if given != expected {
-		info!("Hash: given={}, expected={}", HexDisplay::from(given), HexDisplay::from(expected));
+		println!("Hash: given={}, expected={}", HexDisplay::from(&given.0), HexDisplay::from(&expected.0));
 	}
 }
 
-#[cfg(not(feature = "with-std"))]
+#[cfg(not(feature = "std"))]
 fn info_expect_equal_hash(_given: &Hash, _expected: &Hash) {}
 
 #[cfg(test)]