Migrate from parity-wasmi to wasmi.

substrate/executor/Cargo.toml

@@ -13,7 +13,7 @@ substrate-state-machine = { path = "../state-machine"  }
 ed25519 = { path = "../ed25519" }
 serde = "1.0"
 serde_derive = "1.0"
-parity-wasm = "0.15.0"
+wasmi = "0.1.0"
 byteorder = "1.1"
 rustc-hex = "1.0.0"
 triehash = "0.1.0"

substrate/executor/src/error.rs

@@ -17,10 +17,13 @@
 //! Rust executor possible errors.
 
 use serializer;
+use wasmi;
 
 error_chain! {
 	foreign_links {
 		InvalidData(serializer::Error) #[doc = "Unserializable Data"];
+		Trap(wasmi::Trap) #[doc = "Trap occured during execution"];
+		Wasmi(wasmi::Error) #[doc = "Wasmi loading/instantiating error"];
 	}
 
 	errors {

substrate/executor/src/lib.rs

@@ -35,7 +35,7 @@ extern crate substrate_state_machine as state_machine;
 extern crate ed25519;
 
 extern crate serde;
-extern crate parity_wasm;
+extern crate wasmi;
 extern crate byteorder;
 extern crate rustc_hex;
 extern crate triehash;
@@ -47,12 +47,6 @@ extern crate error_chain;
 #[cfg(test)]
 extern crate assert_matches;
 
-// TODO: move into own crate
-macro_rules! map {
-	($( $name:expr => $value:expr ),*) => (
-		vec![ $( ( $name, $value ) ),* ].into_iter().collect()
-	)
-}
 
 #[macro_use]
 mod wasm_utils;