Fix runtime error.

substrate/polkadot-runtime/src/genesismap.rs

@@ -50,7 +50,7 @@ impl GenesisConfig {
 	}
 
 	pub fn genesis_map(&self) -> HashMap<Vec<u8>, Vec<u8>> {
-		let wasm_runtime = include_bytes!("../wasm/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm").to_vec();
+		let wasm_runtime = include_bytes!("../wasm/genesis.wasm").to_vec();
 		vec![
 			(&b"gov:apr"[..], vec![].join(&self.approval_ratio)),
 			(&b"ses:len"[..], vec![].join(&self.session_length)),

substrate/polkadot-runtime/src/runtime/parachains.rs

@@ -17,7 +17,7 @@
 //! Main parachains logic. For now this is just the determination of which validators do what.
 
 use rstd::prelude::*;
-use runtime_io::mem;
+use rstd::mem;
 use codec::{Slicable, Joiner};
 use support::{Hashable, with_env, storage};
 use runtime::session;

substrate/polkadot-runtime/src/runtime/staking.rs

@@ -17,7 +17,7 @@
 //! Staking manager: Handles balances and periodically determines the best set of validators.
 
 use rstd::prelude::*;
-use runtime_io::cell::RefCell;
+use rstd::cell::RefCell;
 use runtime_io::print;
 use codec::KeyedVec;
 use support::{storage, StorageVec};

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

@@ -18,7 +18,8 @@
 //! and depositing logs.
 
 use rstd::prelude::*;
-use runtime_io::{mem, storage_root, enumerated_trie_root};
+use rstd::mem;
+use runtime_io::{print, storage_root, enumerated_trie_root};
 use codec::{KeyedVec, Slicable};
 use support::{Hashable, storage, with_env};
 use polkadot_primitives::{AccountId, Hash, TxOrder, BlockNumber, Block, Header,
@@ -71,6 +72,7 @@ pub mod internal {
 
 		// execute transactions
 		block.transactions.iter().cloned().for_each(super::execute_transaction);
+
 		// post-transactional book-keeping.
 		staking::internal::check_new_era();
 		session::internal::check_rotate_session();
@@ -103,6 +105,13 @@ pub mod internal {
 	/// Finalise the block - it is up the caller to ensure that all header fields are valid
 	/// except state-root.
 	pub fn finalise_block(mut header: Header) -> Header {
+		// populate environment from header.
+		with_env(|e| {
+			e.block_number = header.number;
+			e.parent_hash = header.parent_hash;
+			mem::swap(&mut header.digest, &mut e.digest);
+		});
+
 		staking::internal::check_new_era();
 		session::internal::check_rotate_session();
 
@@ -211,7 +220,13 @@ fn info_expect_equal_hash(given: &Hash, expected: &Hash) {
 }
 
 #[cfg(not(feature = "std"))]
-fn info_expect_equal_hash(_given: &Hash, _expected: &Hash) {}
+fn info_expect_equal_hash(given: &Hash, expected: &Hash) {
+	if given != expected {
+		print("Hash not equal");
+		print(&given.0[..]);
+		print(&expected.0[..]);
+	}
+}
 
 #[cfg(test)]
 mod tests {

substrate/polkadot-runtime/src/support/environment.rs

@@ -16,10 +16,10 @@
 
 //! Environment API: Allows certain information to be accessed throughout the runtime.
 
-use runtime_io::boxed::Box;
-use runtime_io::mem;
-use runtime_io::cell::RefCell;
-use runtime_io::rc::Rc;
+use rstd::boxed::Box;
+use rstd::mem;
+use rstd::cell::RefCell;
+use rstd::rc::Rc;
 
 use polkadot_primitives::{BlockNumber, Digest, Hash};
 

substrate/polkadot-runtime/wasm/Cargo.lock

@@ -386,6 +386,17 @@ dependencies = [
  "substrate-runtime-std 0.1.0",
 ]
 
+[[package]]
+name = "polkadot-runtime"
+version = "0.1.0"
+dependencies = [
+ "polkadot-primitives 0.1.0",
+ "substrate-codec 0.1.0",
+ "substrate-primitives 0.1.0",
+ "substrate-runtime-io 0.1.0",
+ "substrate-runtime-std 0.1.0",
+]
+
 [[package]]
 name = "proc-macro-hack"
 version = "0.4.0"
@@ -510,17 +521,6 @@ dependencies = [
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "runtime-polkadot"
-version = "0.1.0"
-dependencies = [
- "polkadot-primitives 0.1.0",
- "substrate-codec 0.1.0",
- "substrate-primitives 0.1.0",
- "substrate-runtime-io 0.1.0",
- "substrate-runtime-std 0.1.0",
-]
-
 [[package]]
 name = "rustc-hex"
 version = "1.0.0"
@@ -621,8 +621,6 @@ version = "0.1.0"
 dependencies = [
  "ed25519 0.1.0",
  "environmental 0.1.0",
- "pwasm-alloc 0.1.0",
- "pwasm-libc 0.1.0",
  "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "substrate-codec 0.1.0",
  "substrate-primitives 0.1.0",
@@ -635,6 +633,8 @@ dependencies = [
 name = "substrate-runtime-std"
 version = "0.1.0"
 dependencies = [
+ "pwasm-alloc 0.1.0",
+ "pwasm-libc 0.1.0",
  "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 

substrate/polkadot-runtime/wasm/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "runtime-polkadot"
+name = "polkadot-runtime"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 

substrate/polkadot-runtime/wasm/build.sh

@@ -2,7 +2,7 @@
 set -e
 
 cargo +nightly build --target=wasm32-unknown-unknown --release
-for i in polkadot
+for i in polkadot_runtime
 do
-	wasm-gc target/wasm32-unknown-unknown/release/runtime_$i.wasm target/wasm32-unknown-unknown/release/runtime_$i.compact.wasm
+	wasm-gc target/wasm32-unknown-unknown/release/$i.wasm target/wasm32-unknown-unknown/release/$i.compact.wasm
 done