From 08824e3ecea21ee71769726a3a3a934cdf778c6c Mon Sep 17 00:00:00 2001
From: Gav Wood <gav@ethcore.io>
Date: Wed, 13 Jan 2016 23:07:01 +0100
Subject: [PATCH] Move macros to util.

---
 src/account.rs     | 24 ------------------------
 src/lib.rs         |  2 +-
 src/tests/state.rs |  7 -------
 3 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/src/account.rs b/src/account.rs
index f68cfe4e8..095380116 100644
--- a/src/account.rs
+++ b/src/account.rs
@@ -104,30 +104,6 @@ pub fn pod_map_diff(pre: &BTreeMap<Address, PodAccount>, post: &BTreeMap<Address
 	pre.keys().merge(post.keys()).filter_map(|acc| pod_diff(pre.get(acc), post.get(acc)).map(|d|(acc.clone(), d))).collect()
 }
 
-macro_rules! map {
-	( $( $x:expr => $y:expr ),* ) => {
-		vec![ $( ($x, $y) ),* ].into_iter().collect::<BTreeMap<_, _>>()
-	}
-}
-
-macro_rules! mapx {
-	( $( $x:expr => $y:expr ),* ) => {
-		vec![ $( ( From::from($x), From::from($y) ) ),* ].into_iter().collect::<BTreeMap<_, _>>()
-	}
-}
-
-macro_rules! x {
-	( $x:expr ) => {
-		From::from($x)
-	}
-}
-
-macro_rules! xx {
-	( $x:expr ) => {
-		From::from(From::from($x))
-	}
-}
-
 #[test]
 fn state_diff_create_delete() {
 	let a = map![
diff --git a/src/lib.rs b/src/lib.rs
index 5cecba2b8..8610404d2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -84,7 +84,7 @@ extern crate time;
 extern crate env_logger;
 #[cfg(feature = "jit" )] extern crate evmjit;
 
-extern crate ethcore_util as util;
+#[macro_use] extern crate ethcore_util as util;
 
 pub mod common;
 pub mod basic_types;
diff --git a/src/tests/state.rs b/src/tests/state.rs
index 208ba4dfd..197f2d4d8 100644
--- a/src/tests/state.rs
+++ b/src/tests/state.rs
@@ -2,13 +2,6 @@ use super::test_common::*;
 use state::*;
 use ethereum;
 
-pub fn hashmap_h256_h256_from_json(json: &Json) -> HashMap<H256, H256> {
-	json.as_object().unwrap().iter().fold(HashMap::new(), |mut m, (key, value)| {
-		m.insert(H256::from(&u256_from_hex(key)), H256::from(&u256_from_json(value)));
-		m
-	})
-}
-
 pub fn map_h256_h256_from_json(json: &Json) -> BTreeMap<H256, H256> {
 	json.as_object().unwrap().iter().fold(BTreeMap::new(), |mut m, (key, value)| {
 		m.insert(H256::from(&u256_from_hex(key)), H256::from(&u256_from_json(value)));