Move additional Trie implementations to tests where they belong.

.gitignore

@@ -19,9 +19,6 @@ ipch
 *.opensdf
 *.suo
 
-# Generated headers
-*.h
-
 *.user
 *.user.*
 *~

libethereum/FixedHash.h

@@ -62,7 +62,7 @@ public:
 	explicit FixedHash(byte const* _bs, ConstructFromPointerType) { memcpy(m_data.data(), _bs, N); }
 
 	/// Explicitly construct, copying from a  string.
-	explicit FixedHash(std::string const& _s, ConstructFromStringType _t = FromHex): FixedHash(_t == FromHex ? fromHex(_s) : asBytes(_s)) {}
+	explicit FixedHash(std::string const& _s, ConstructFromStringType _t = FromHex): FixedHash(_t == FromHex ? fromHex(_s) : eth::asBytes(_s)) {}
 
 	/// Convert to arithmetic type.
 	operator Arith() const { return fromBigEndian<Arith>(m_data); }

libethereum/MemTrie.cpp → test/MemTrie.cpp

@@ -19,9 +19,10 @@
  * @date 2014
  */
 
-#include "CommonEth.h"
-#include "TrieCommon.h"
 #include "MemTrie.h"
+
+#include <CommonEth.h>
+#include <TrieCommon.h>
 using namespace std;
 using namespace eth;
 

libethereum/MemTrie.h → test/MemTrie.h

@@ -21,7 +21,8 @@
 
 #pragma once
 
-#include "Common.h"
+#include <Common.h>
+#include <FixedHash.h>
 
 namespace eth
 {

libethereum/TrieHash.cpp → test/TrieHash.cpp

@@ -19,9 +19,10 @@
  * @date 2014
  */
 
-#include "CommonEth.h"
-#include "TrieCommon.h"
 #include "TrieHash.h"
+
+#include <CommonEth.h>
+#include <TrieCommon.h>
 using namespace std;
 using namespace eth;
 

libethereum/TrieHash.h → test/TrieHash.h

@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include "Common.h"
-#include "FixedHash.h"
+#include <Common.h>
+#include <FixedHash.h>
 
 namespace eth
 {

test/trie.cpp

@@ -24,9 +24,9 @@
 #include "../json_spirit/json_spirit_reader_template.h"
 #include "../json_spirit/json_spirit_writer_template.h"
 #include <random>
-#include <TrieHash.h>
 #include <TrieDB.h>
-#include <MemTrie.h>
+#include "TrieHash.h"
+#include "MemTrie.h"
 using namespace std;
 using namespace eth;