Bring runtime API up to date with Substrate master (#17)

* Fixups for 646

* Fixes for API

* For for #678

* Fix runtime

* Update and build

* Tests build

* Fix tests

polkadot/test-parachains/adder/Cargo.toml

@@ -6,5 +6,5 @@ description = "Test parachain which adds to a number as its state transition"
 
 [dependencies]
 polkadot-parachain = { path = "../../parachain/", default-features = false }
-substrate-codec-derive = { git = "https://github.com/paritytech/substrate", default-features = false }
+parity-codec-derive = { git = "https://github.com/paritytech/substrate", default-features = false }
 tiny-keccak = "1.4"

polkadot/test-parachains/adder/collator/Cargo.toml

@@ -8,7 +8,7 @@ adder = { path = ".." }
 polkadot-parachain = { path = "../../../parachain" }
 polkadot-collator = { path = "../../../collator" }
 polkadot-primitives = { path = "../../../primitives" }
-ed25519 = { git = "https://github.com/paritytech/substrate" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate" }
 parking_lot = "0.4"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
 futures = "0.1"

polkadot/test-parachains/adder/collator/src/main.rs

@@ -17,10 +17,10 @@
 //! Collator for polkadot
 
 extern crate adder;
+extern crate substrate_primitives;
 extern crate polkadot_parachain as parachain;
 extern crate polkadot_primitives as primitives;
 extern crate polkadot_collator as collator;
-extern crate ed25519;
 extern crate parking_lot;
 extern crate ctrlc;
 extern crate futures;
@@ -31,7 +31,7 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use adder::{HeadData as AdderHead, BlockData as AdderBody};
-use ed25519::Pair;
+use substrate_primitives::ed25519::Pair;
 use parachain::codec::{Encode, Decode};
 use primitives::parachain::{HeadData, BlockData, Id as ParaId, Message};
 use collator::{InvalidHead, ParachainContext, VersionInfo};

polkadot/test-parachains/adder/src/lib.rs

@@ -19,7 +19,7 @@
 #![no_std]
 
 #[macro_use]
-extern crate substrate_codec_derive;
+extern crate parity_codec_derive;
 
 extern crate polkadot_parachain as parachain;
 extern crate tiny_keccak;