use the map! macro instead of defining it all over the place (#867)

* remove one map implementation in test

* remove one map macro

* remove one map macro

* remove one map macro

substrate/core/executor/src/lib.rs

@@ -32,6 +32,7 @@
 
 extern crate parity_codec as codec;
 extern crate sr_io as runtime_io;
+#[cfg_attr(test, macro_use)]
 extern crate substrate_primitives as primitives;
 extern crate substrate_serializer as serializer;
 extern crate substrate_state_machine as state_machine;

substrate/core/executor/src/wasm_executor.rs

@@ -558,13 +558,6 @@ mod tests {
 	use codec::Encode;
 	use state_machine::TestExternalities;
 
-	// TODO: move into own crate.
-	macro_rules! map {
-		($( $name:expr => $value:expr ),*) => (
-			vec![ $( ( $name, $value ) ),* ].into_iter().collect()
-		)
-	}
-
 	#[test]
 	fn returning_should_work() {
 		let mut ext = TestExternalities::default();