From 23f10dae8a8e95cd5302b60ceb70b43cb9e60063 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Sun, 1 Mar 2015 17:47:27 +0100
Subject: Fat Trie and tests for it.

---
 trie.cpp | 44 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

(limited to 'trie.cpp')

diff --git a/trie.cpp b/trie.cpp
index dd335b4a..18e115da 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -50,6 +50,8 @@ static unsigned fac(unsigned _i)
 }
 }
 
+using dev::operator <<;
+
 BOOST_AUTO_TEST_SUITE(TrieTests)
 
 BOOST_AUTO_TEST_CASE(trie_test_anyorder)
@@ -81,15 +83,35 @@ BOOST_AUTO_TEST_CASE(trie_test_anyorder)
 			next_permutation(ss.begin(), ss.end());
 			MemoryDB m;
 			GenericTrieDB<MemoryDB> t(&m);
+			MemoryDB hm;
+			HashedGenericTrieDB<MemoryDB> ht(&hm);
+			MemoryDB fm;
+			FatGenericTrieDB<MemoryDB> ft(&fm);
 			t.init();
+			ht.init();
+			ft.init();
 			BOOST_REQUIRE(t.check(true));
+			BOOST_REQUIRE(ht.check(true));
+			BOOST_REQUIRE(ft.check(true));
 			for (auto const& k: ss)
 			{
 				t.insert(k.first, k.second);
+				ht.insert(k.first, k.second);
+				ft.insert(k.first, k.second);
 				BOOST_REQUIRE(t.check(true));
+				BOOST_REQUIRE(ht.check(true));
+				BOOST_REQUIRE(ft.check(true));
+				for (auto i = ft.begin(), j = t.begin(); i != ft.end() && j != t.end(); ++i, ++j)
+				{
+					BOOST_CHECK_EQUAL(i == ft.end(), j == t.end());
+					BOOST_REQUIRE((*i).first.toBytes() == (*j).first.toBytes());
+					BOOST_REQUIRE((*i).second.toBytes() == (*j).second.toBytes());
+				}
+				BOOST_CHECK_EQUAL(ht.root(), ft.root());
 			}
 			BOOST_REQUIRE(!o["root"].is_null());
 			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(t.root().asArray()));
+			BOOST_CHECK_EQUAL(ht.root(), ft.root());
 		}
 	}
 }
@@ -141,15 +163,33 @@ BOOST_AUTO_TEST_CASE(trie_tests_ordered)
 
 		MemoryDB m;
 		GenericTrieDB<MemoryDB> t(&m);
+		MemoryDB hm;
+		HashedGenericTrieDB<MemoryDB> ht(&hm);
+		MemoryDB fm;
+		FatGenericTrieDB<MemoryDB> ft(&fm);
 		t.init();
+		ht.init();
+		ft.init();
 		BOOST_REQUIRE(t.check(true));
+		BOOST_REQUIRE(ht.check(true));
+		BOOST_REQUIRE(ft.check(true));
+
 		for (auto const& k: ss)
 		{
 			if (find(keysToBeDeleted.begin(), keysToBeDeleted.end(), k.first) != keysToBeDeleted.end() && k.second.empty())
-				t.remove(k.first);
+				t.remove(k.first), ht.remove(k.first), ft.remove(k.first);
 			else
-				t.insert(k.first, k.second);
+				t.insert(k.first, k.second), ht.insert(k.first, k.second), ft.insert(k.first, k.second);
 			BOOST_REQUIRE(t.check(true));
+			BOOST_REQUIRE(ht.check(true));
+			BOOST_REQUIRE(ft.check(true));
+			for (auto i = ft.begin(), j = t.begin(); i != ft.end() && j != t.end(); ++i, ++j)
+			{
+				BOOST_CHECK_EQUAL(i == ft.end(), j == t.end());
+				BOOST_REQUIRE((*i).first.toBytes() == (*j).first.toBytes());
+				BOOST_REQUIRE((*i).second.toBytes() == (*j).second.toBytes());
+			}
+			BOOST_CHECK_EQUAL(ht.root(), ft.root());
 		}
 
 		BOOST_REQUIRE(!o["root"].is_null());
-- 
cgit v1.2.3


From 19324009e1129b7411910865258794b0518eddf8 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Sun, 1 Mar 2015 22:54:05 +0100
Subject: State integration test. Fixes to the FatTrie.

---
 trie.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'trie.cpp')

diff --git a/trie.cpp b/trie.cpp
index 18e115da..84d0e846 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -54,6 +54,26 @@ using dev::operator <<;
 
 BOOST_AUTO_TEST_SUITE(TrieTests)
 
+BOOST_AUTO_TEST_CASE(fat_trie)
+{
+	h256 r;
+	MemoryDB fm;
+	{
+		FatGenericTrieDB<MemoryDB> ft(&fm);
+		ft.init();
+		ft.insert(h256("69", h256::FromHex, h256::AlignRight).ref(), h256("414243", h256::FromHex, h256::AlignRight).ref());
+		for (auto i: ft)
+			cnote << i.first << i.second;
+		r = ft.root();
+	}
+	{
+		FatGenericTrieDB<MemoryDB> ft(&fm);
+		ft.setRoot(r);
+		for (auto i: ft)
+			cnote << i.first << i.second;
+	}
+}
+
 BOOST_AUTO_TEST_CASE(trie_test_anyorder)
 {
 	string testPath = test::getTestPath();
-- 
cgit v1.2.3


From ebcd518f6a5b5c3f7f90b87b75becc0b631d9c66 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Tue, 3 Mar 2015 13:00:09 +0100
Subject: Update precompiled stuff. Add extra tests for secure trie.

---
 trie.cpp | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

(limited to 'trie.cpp')

diff --git a/trie.cpp b/trie.cpp
index 84d0e846..9e59dd31 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -74,6 +74,68 @@ BOOST_AUTO_TEST_CASE(fat_trie)
 	}
 }
 
+BOOST_AUTO_TEST_CASE(hex_encoded_securetrie_test)
+{
+	string testPath = test::getTestPath();
+
+	testPath += "/TrieTests";
+
+	cnote << "Testing Secure Trie...";
+	js::mValue v;
+	string s = asString(contents(testPath + "/hex_encoded_securetrie_test.json"));
+	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'hex_encoded_securetrie_test.json' is empty. Have you cloned the 'tests' repo branch develop?");
+	js::read_string(s, v);
+	for (auto& i: v.get_obj())
+	{
+		cnote << i.first;
+		js::mObject& o = i.second.get_obj();
+		vector<pair<string, string>> ss;
+		for (auto i: o["in"].get_obj())
+		{
+			ss.push_back(make_pair(i.first, i.second.get_str()));
+			if (!ss.back().first.find("0x"))
+				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
+			if (!ss.back().second.find("0x"))
+				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
+		}
+		for (unsigned j = 0; j < min(1000000000u, dev::test::fac((unsigned)ss.size())); ++j)
+		{
+			next_permutation(ss.begin(), ss.end());
+			MemoryDB m;
+			GenericTrieDB<MemoryDB> t(&m);
+			MemoryDB hm;
+			HashedGenericTrieDB<MemoryDB> ht(&hm);
+			MemoryDB fm;
+			FatGenericTrieDB<MemoryDB> ft(&fm);
+			t.init();
+			ht.init();
+			ft.init();
+			BOOST_REQUIRE(t.check(true));
+			BOOST_REQUIRE(ht.check(true));
+			BOOST_REQUIRE(ft.check(true));
+			for (auto const& k: ss)
+			{
+				t.insert(k.first, k.second);
+				ht.insert(k.first, k.second);
+				ft.insert(k.first, k.second);
+				BOOST_REQUIRE(t.check(true));
+				BOOST_REQUIRE(ht.check(true));
+				BOOST_REQUIRE(ft.check(true));
+				for (auto i = ft.begin(), j = t.begin(); i != ft.end() && j != t.end(); ++i, ++j)
+				{
+					BOOST_CHECK_EQUAL(i == ft.end(), j == t.end());
+					BOOST_REQUIRE((*i).first.toBytes() == (*j).first.toBytes());
+					BOOST_REQUIRE((*i).second.toBytes() == (*j).second.toBytes());
+				}
+				BOOST_CHECK_EQUAL(ht.root(), ft.root());
+			}
+			BOOST_REQUIRE(!o["root"].is_null());
+			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ht.root().asArray()));
+			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ft.root().asArray()));
+		}
+	}
+}
+
 BOOST_AUTO_TEST_CASE(trie_test_anyorder)
 {
 	string testPath = test::getTestPath();
-- 
cgit v1.2.3


From 31110cd27a78a04bcec0d8ae3d82f5a9e81ad289 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Sun, 1 Mar 2015 22:54:05 +0100
Subject: State integration test. Fixes to the FatTrie.

---
 trie.cpp | 62 --------------------------------------------------------------
 1 file changed, 62 deletions(-)

(limited to 'trie.cpp')

diff --git a/trie.cpp b/trie.cpp
index 9e59dd31..84d0e846 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -74,68 +74,6 @@ BOOST_AUTO_TEST_CASE(fat_trie)
 	}
 }
 
-BOOST_AUTO_TEST_CASE(hex_encoded_securetrie_test)
-{
-	string testPath = test::getTestPath();
-
-	testPath += "/TrieTests";
-
-	cnote << "Testing Secure Trie...";
-	js::mValue v;
-	string s = asString(contents(testPath + "/hex_encoded_securetrie_test.json"));
-	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'hex_encoded_securetrie_test.json' is empty. Have you cloned the 'tests' repo branch develop?");
-	js::read_string(s, v);
-	for (auto& i: v.get_obj())
-	{
-		cnote << i.first;
-		js::mObject& o = i.second.get_obj();
-		vector<pair<string, string>> ss;
-		for (auto i: o["in"].get_obj())
-		{
-			ss.push_back(make_pair(i.first, i.second.get_str()));
-			if (!ss.back().first.find("0x"))
-				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
-			if (!ss.back().second.find("0x"))
-				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
-		}
-		for (unsigned j = 0; j < min(1000000000u, dev::test::fac((unsigned)ss.size())); ++j)
-		{
-			next_permutation(ss.begin(), ss.end());
-			MemoryDB m;
-			GenericTrieDB<MemoryDB> t(&m);
-			MemoryDB hm;
-			HashedGenericTrieDB<MemoryDB> ht(&hm);
-			MemoryDB fm;
-			FatGenericTrieDB<MemoryDB> ft(&fm);
-			t.init();
-			ht.init();
-			ft.init();
-			BOOST_REQUIRE(t.check(true));
-			BOOST_REQUIRE(ht.check(true));
-			BOOST_REQUIRE(ft.check(true));
-			for (auto const& k: ss)
-			{
-				t.insert(k.first, k.second);
-				ht.insert(k.first, k.second);
-				ft.insert(k.first, k.second);
-				BOOST_REQUIRE(t.check(true));
-				BOOST_REQUIRE(ht.check(true));
-				BOOST_REQUIRE(ft.check(true));
-				for (auto i = ft.begin(), j = t.begin(); i != ft.end() && j != t.end(); ++i, ++j)
-				{
-					BOOST_CHECK_EQUAL(i == ft.end(), j == t.end());
-					BOOST_REQUIRE((*i).first.toBytes() == (*j).first.toBytes());
-					BOOST_REQUIRE((*i).second.toBytes() == (*j).second.toBytes());
-				}
-				BOOST_CHECK_EQUAL(ht.root(), ft.root());
-			}
-			BOOST_REQUIRE(!o["root"].is_null());
-			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ht.root().asArray()));
-			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ft.root().asArray()));
-		}
-	}
-}
-
 BOOST_AUTO_TEST_CASE(trie_test_anyorder)
 {
 	string testPath = test::getTestPath();
-- 
cgit v1.2.3


From dacd342424c2ec504a74ac9f3310b63c282de780 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Tue, 3 Mar 2015 13:00:09 +0100
Subject: Update precompiled stuff. Add extra tests for secure trie.

---
 trie.cpp | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

(limited to 'trie.cpp')

diff --git a/trie.cpp b/trie.cpp
index 84d0e846..9e59dd31 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -74,6 +74,68 @@ BOOST_AUTO_TEST_CASE(fat_trie)
 	}
 }
 
+BOOST_AUTO_TEST_CASE(hex_encoded_securetrie_test)
+{
+	string testPath = test::getTestPath();
+
+	testPath += "/TrieTests";
+
+	cnote << "Testing Secure Trie...";
+	js::mValue v;
+	string s = asString(contents(testPath + "/hex_encoded_securetrie_test.json"));
+	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'hex_encoded_securetrie_test.json' is empty. Have you cloned the 'tests' repo branch develop?");
+	js::read_string(s, v);
+	for (auto& i: v.get_obj())
+	{
+		cnote << i.first;
+		js::mObject& o = i.second.get_obj();
+		vector<pair<string, string>> ss;
+		for (auto i: o["in"].get_obj())
+		{
+			ss.push_back(make_pair(i.first, i.second.get_str()));
+			if (!ss.back().first.find("0x"))
+				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
+			if (!ss.back().second.find("0x"))
+				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
+		}
+		for (unsigned j = 0; j < min(1000000000u, dev::test::fac((unsigned)ss.size())); ++j)
+		{
+			next_permutation(ss.begin(), ss.end());
+			MemoryDB m;
+			GenericTrieDB<MemoryDB> t(&m);
+			MemoryDB hm;
+			HashedGenericTrieDB<MemoryDB> ht(&hm);
+			MemoryDB fm;
+			FatGenericTrieDB<MemoryDB> ft(&fm);
+			t.init();
+			ht.init();
+			ft.init();
+			BOOST_REQUIRE(t.check(true));
+			BOOST_REQUIRE(ht.check(true));
+			BOOST_REQUIRE(ft.check(true));
+			for (auto const& k: ss)
+			{
+				t.insert(k.first, k.second);
+				ht.insert(k.first, k.second);
+				ft.insert(k.first, k.second);
+				BOOST_REQUIRE(t.check(true));
+				BOOST_REQUIRE(ht.check(true));
+				BOOST_REQUIRE(ft.check(true));
+				for (auto i = ft.begin(), j = t.begin(); i != ft.end() && j != t.end(); ++i, ++j)
+				{
+					BOOST_CHECK_EQUAL(i == ft.end(), j == t.end());
+					BOOST_REQUIRE((*i).first.toBytes() == (*j).first.toBytes());
+					BOOST_REQUIRE((*i).second.toBytes() == (*j).second.toBytes());
+				}
+				BOOST_CHECK_EQUAL(ht.root(), ft.root());
+			}
+			BOOST_REQUIRE(!o["root"].is_null());
+			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ht.root().asArray()));
+			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ft.root().asArray()));
+		}
+	}
+}
+
 BOOST_AUTO_TEST_CASE(trie_test_anyorder)
 {
 	string testPath = test::getTestPath();
-- 
cgit v1.2.3


From 4048bf0d97d13b48b3d2785e4dcbe664c508d4c9 Mon Sep 17 00:00:00 2001
From: CJentzsch <jentzsch.software@gmail.com>
Date: Mon, 2 Mar 2015 14:34:45 +0100
Subject: add secure trie tests

---
 trie.cpp | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)

(limited to 'trie.cpp')

diff --git a/trie.cpp b/trie.cpp
index 9e59dd31..e03e9683 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -198,6 +198,48 @@ BOOST_AUTO_TEST_CASE(trie_test_anyorder)
 	}
 }
 
+BOOST_AUTO_TEST_CASE(trie_test_anyorder_secureTrie)
+{
+	string testPath = test::getTestPath();
+
+	testPath += "/TrieTests";
+
+	cnote << "Testing Trie...";
+	js::mValue v;
+	string s = asString(contents(testPath + "/trieanyorder_secureTrie.json"));
+	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'trieanyorder.json' is empty. Have you cloned the 'tests' repo branch develop?");
+	js::read_string(s, v);
+	for (auto& i: v.get_obj())
+	{
+		cnote << i.first;
+		js::mObject& o = i.second.get_obj();
+		vector<pair<string, string>> ss;
+		for (auto i: o["in"].get_obj())
+		{
+			ss.push_back(make_pair(i.first, i.second.get_str()));
+			if (!ss.back().first.find("0x"))
+				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
+			if (!ss.back().second.find("0x"))
+				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
+		}
+		for (unsigned j = 0; j < min(1000u, dev::test::fac((unsigned)ss.size())); ++j)
+		{
+			next_permutation(ss.begin(), ss.end());
+			MemoryDB m;
+			SecureGenericTrieDB<MemoryDB> t(&m);
+			t.init();
+			BOOST_REQUIRE(t.check(true));
+			for (auto const& k: ss)
+			{
+				t.insert(k.first, k.second);
+				BOOST_REQUIRE(t.check(true));
+			}
+			BOOST_REQUIRE(!o["root"].is_null());
+			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(t.root().asArray()));
+		}
+	}
+}
+
 BOOST_AUTO_TEST_CASE(trie_tests_ordered)
 {
 	string testPath = test::getTestPath();
@@ -279,6 +321,69 @@ BOOST_AUTO_TEST_CASE(trie_tests_ordered)
 	}
 }
 
+BOOST_AUTO_TEST_CASE(trie_tests_ordered_secureTrie)
+{
+	string testPath = test::getTestPath();
+
+	testPath += "/TrieTests";
+
+	cnote << "Testing Trie...";
+	js::mValue v;
+	string s = asString(contents(testPath + "/trietest_secureTrie.json"));
+	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'trietest.json' is empty. Have you cloned the 'tests' repo branch develop?");
+	js::read_string(s, v);
+
+	for (auto& i: v.get_obj())
+	{
+		cnote << i.first;
+		js::mObject& o = i.second.get_obj();
+		vector<pair<string, string>> ss;
+		vector<string> keysToBeDeleted;
+		for (auto& i: o["in"].get_array())
+		{
+			vector<string> values;
+			for (auto& s: i.get_array())
+			{
+				if (s.type() == json_spirit::str_type)
+					values.push_back(s.get_str());
+				else if (s.type() == json_spirit::null_type)
+				{
+					// mark entry for deletion
+					values.push_back("");
+					if (!values[0].find("0x"))
+						values[0] = asString(fromHex(values[0].substr(2)));
+					keysToBeDeleted.push_back(values[0]);
+				}
+				else
+					BOOST_FAIL("Bad type (expected string)");
+			}
+
+			BOOST_REQUIRE(values.size() == 2);
+			ss.push_back(make_pair(values[0], values[1]));
+			if (!ss.back().first.find("0x"))
+				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
+			if (!ss.back().second.find("0x"))
+				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
+		}
+
+		MemoryDB m;
+		SecureGenericTrieDB<MemoryDB> t(&m);
+		t.init();
+		BOOST_REQUIRE(t.check(true));
+		for (auto const& k: ss)
+		{
+			if (find(keysToBeDeleted.begin(), keysToBeDeleted.end(), k.first) != keysToBeDeleted.end() && k.second.empty())
+				t.remove(k.first);
+			else
+				t.insert(k.first, k.second);
+			BOOST_REQUIRE(t.check(true));
+		}
+
+		BOOST_REQUIRE(!o["root"].is_null());
+		BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(t.root().asArray()));
+	}
+}
+
 inline h256 stringMapHash256(StringMap const& _s)
 {
 	return hash256(_s);
-- 
cgit v1.2.3


From 47321f973cb99f7568be82fa223b3f035a51b70c Mon Sep 17 00:00:00 2001
From: CJentzsch <jentzsch.software@gmail.com>
Date: Fri, 6 Mar 2015 01:13:45 +0100
Subject: merge

---
 trie.cpp | 105 ---------------------------------------------------------------
 1 file changed, 105 deletions(-)

(limited to 'trie.cpp')

diff --git a/trie.cpp b/trie.cpp
index e03e9683..9e59dd31 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -198,48 +198,6 @@ BOOST_AUTO_TEST_CASE(trie_test_anyorder)
 	}
 }
 
-BOOST_AUTO_TEST_CASE(trie_test_anyorder_secureTrie)
-{
-	string testPath = test::getTestPath();
-
-	testPath += "/TrieTests";
-
-	cnote << "Testing Trie...";
-	js::mValue v;
-	string s = asString(contents(testPath + "/trieanyorder_secureTrie.json"));
-	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'trieanyorder.json' is empty. Have you cloned the 'tests' repo branch develop?");
-	js::read_string(s, v);
-	for (auto& i: v.get_obj())
-	{
-		cnote << i.first;
-		js::mObject& o = i.second.get_obj();
-		vector<pair<string, string>> ss;
-		for (auto i: o["in"].get_obj())
-		{
-			ss.push_back(make_pair(i.first, i.second.get_str()));
-			if (!ss.back().first.find("0x"))
-				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
-			if (!ss.back().second.find("0x"))
-				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
-		}
-		for (unsigned j = 0; j < min(1000u, dev::test::fac((unsigned)ss.size())); ++j)
-		{
-			next_permutation(ss.begin(), ss.end());
-			MemoryDB m;
-			SecureGenericTrieDB<MemoryDB> t(&m);
-			t.init();
-			BOOST_REQUIRE(t.check(true));
-			for (auto const& k: ss)
-			{
-				t.insert(k.first, k.second);
-				BOOST_REQUIRE(t.check(true));
-			}
-			BOOST_REQUIRE(!o["root"].is_null());
-			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(t.root().asArray()));
-		}
-	}
-}
-
 BOOST_AUTO_TEST_CASE(trie_tests_ordered)
 {
 	string testPath = test::getTestPath();
@@ -321,69 +279,6 @@ BOOST_AUTO_TEST_CASE(trie_tests_ordered)
 	}
 }
 
-BOOST_AUTO_TEST_CASE(trie_tests_ordered_secureTrie)
-{
-	string testPath = test::getTestPath();
-
-	testPath += "/TrieTests";
-
-	cnote << "Testing Trie...";
-	js::mValue v;
-	string s = asString(contents(testPath + "/trietest_secureTrie.json"));
-	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'trietest.json' is empty. Have you cloned the 'tests' repo branch develop?");
-	js::read_string(s, v);
-
-	for (auto& i: v.get_obj())
-	{
-		cnote << i.first;
-		js::mObject& o = i.second.get_obj();
-		vector<pair<string, string>> ss;
-		vector<string> keysToBeDeleted;
-		for (auto& i: o["in"].get_array())
-		{
-			vector<string> values;
-			for (auto& s: i.get_array())
-			{
-				if (s.type() == json_spirit::str_type)
-					values.push_back(s.get_str());
-				else if (s.type() == json_spirit::null_type)
-				{
-					// mark entry for deletion
-					values.push_back("");
-					if (!values[0].find("0x"))
-						values[0] = asString(fromHex(values[0].substr(2)));
-					keysToBeDeleted.push_back(values[0]);
-				}
-				else
-					BOOST_FAIL("Bad type (expected string)");
-			}
-
-			BOOST_REQUIRE(values.size() == 2);
-			ss.push_back(make_pair(values[0], values[1]));
-			if (!ss.back().first.find("0x"))
-				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
-			if (!ss.back().second.find("0x"))
-				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
-		}
-
-		MemoryDB m;
-		SecureGenericTrieDB<MemoryDB> t(&m);
-		t.init();
-		BOOST_REQUIRE(t.check(true));
-		for (auto const& k: ss)
-		{
-			if (find(keysToBeDeleted.begin(), keysToBeDeleted.end(), k.first) != keysToBeDeleted.end() && k.second.empty())
-				t.remove(k.first);
-			else
-				t.insert(k.first, k.second);
-			BOOST_REQUIRE(t.check(true));
-		}
-
-		BOOST_REQUIRE(!o["root"].is_null());
-		BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(t.root().asArray()));
-	}
-}
-
 inline h256 stringMapHash256(StringMap const& _s)
 {
 	return hash256(_s);
-- 
cgit v1.2.3


From 87197341cfaee53a12fd3115ab4d17cc6466d665 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Sun, 1 Mar 2015 22:54:05 +0100
Subject: State integration test. Fixes to the FatTrie.

---
 trie.cpp | 62 --------------------------------------------------------------
 1 file changed, 62 deletions(-)

(limited to 'trie.cpp')

diff --git a/trie.cpp b/trie.cpp
index 9e59dd31..84d0e846 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -74,68 +74,6 @@ BOOST_AUTO_TEST_CASE(fat_trie)
 	}
 }
 
-BOOST_AUTO_TEST_CASE(hex_encoded_securetrie_test)
-{
-	string testPath = test::getTestPath();
-
-	testPath += "/TrieTests";
-
-	cnote << "Testing Secure Trie...";
-	js::mValue v;
-	string s = asString(contents(testPath + "/hex_encoded_securetrie_test.json"));
-	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'hex_encoded_securetrie_test.json' is empty. Have you cloned the 'tests' repo branch develop?");
-	js::read_string(s, v);
-	for (auto& i: v.get_obj())
-	{
-		cnote << i.first;
-		js::mObject& o = i.second.get_obj();
-		vector<pair<string, string>> ss;
-		for (auto i: o["in"].get_obj())
-		{
-			ss.push_back(make_pair(i.first, i.second.get_str()));
-			if (!ss.back().first.find("0x"))
-				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
-			if (!ss.back().second.find("0x"))
-				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
-		}
-		for (unsigned j = 0; j < min(1000000000u, dev::test::fac((unsigned)ss.size())); ++j)
-		{
-			next_permutation(ss.begin(), ss.end());
-			MemoryDB m;
-			GenericTrieDB<MemoryDB> t(&m);
-			MemoryDB hm;
-			HashedGenericTrieDB<MemoryDB> ht(&hm);
-			MemoryDB fm;
-			FatGenericTrieDB<MemoryDB> ft(&fm);
-			t.init();
-			ht.init();
-			ft.init();
-			BOOST_REQUIRE(t.check(true));
-			BOOST_REQUIRE(ht.check(true));
-			BOOST_REQUIRE(ft.check(true));
-			for (auto const& k: ss)
-			{
-				t.insert(k.first, k.second);
-				ht.insert(k.first, k.second);
-				ft.insert(k.first, k.second);
-				BOOST_REQUIRE(t.check(true));
-				BOOST_REQUIRE(ht.check(true));
-				BOOST_REQUIRE(ft.check(true));
-				for (auto i = ft.begin(), j = t.begin(); i != ft.end() && j != t.end(); ++i, ++j)
-				{
-					BOOST_CHECK_EQUAL(i == ft.end(), j == t.end());
-					BOOST_REQUIRE((*i).first.toBytes() == (*j).first.toBytes());
-					BOOST_REQUIRE((*i).second.toBytes() == (*j).second.toBytes());
-				}
-				BOOST_CHECK_EQUAL(ht.root(), ft.root());
-			}
-			BOOST_REQUIRE(!o["root"].is_null());
-			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ht.root().asArray()));
-			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ft.root().asArray()));
-		}
-	}
-}
-
 BOOST_AUTO_TEST_CASE(trie_test_anyorder)
 {
 	string testPath = test::getTestPath();
-- 
cgit v1.2.3


From c21f08030530916b7db37e8f3fa12c8fe7d4d22f Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Tue, 3 Mar 2015 13:00:09 +0100
Subject: Update precompiled stuff. Add extra tests for secure trie.

---
 trie.cpp | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

(limited to 'trie.cpp')

diff --git a/trie.cpp b/trie.cpp
index 84d0e846..9e59dd31 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -74,6 +74,68 @@ BOOST_AUTO_TEST_CASE(fat_trie)
 	}
 }
 
+BOOST_AUTO_TEST_CASE(hex_encoded_securetrie_test)
+{
+	string testPath = test::getTestPath();
+
+	testPath += "/TrieTests";
+
+	cnote << "Testing Secure Trie...";
+	js::mValue v;
+	string s = asString(contents(testPath + "/hex_encoded_securetrie_test.json"));
+	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'hex_encoded_securetrie_test.json' is empty. Have you cloned the 'tests' repo branch develop?");
+	js::read_string(s, v);
+	for (auto& i: v.get_obj())
+	{
+		cnote << i.first;
+		js::mObject& o = i.second.get_obj();
+		vector<pair<string, string>> ss;
+		for (auto i: o["in"].get_obj())
+		{
+			ss.push_back(make_pair(i.first, i.second.get_str()));
+			if (!ss.back().first.find("0x"))
+				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
+			if (!ss.back().second.find("0x"))
+				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
+		}
+		for (unsigned j = 0; j < min(1000000000u, dev::test::fac((unsigned)ss.size())); ++j)
+		{
+			next_permutation(ss.begin(), ss.end());
+			MemoryDB m;
+			GenericTrieDB<MemoryDB> t(&m);
+			MemoryDB hm;
+			HashedGenericTrieDB<MemoryDB> ht(&hm);
+			MemoryDB fm;
+			FatGenericTrieDB<MemoryDB> ft(&fm);
+			t.init();
+			ht.init();
+			ft.init();
+			BOOST_REQUIRE(t.check(true));
+			BOOST_REQUIRE(ht.check(true));
+			BOOST_REQUIRE(ft.check(true));
+			for (auto const& k: ss)
+			{
+				t.insert(k.first, k.second);
+				ht.insert(k.first, k.second);
+				ft.insert(k.first, k.second);
+				BOOST_REQUIRE(t.check(true));
+				BOOST_REQUIRE(ht.check(true));
+				BOOST_REQUIRE(ft.check(true));
+				for (auto i = ft.begin(), j = t.begin(); i != ft.end() && j != t.end(); ++i, ++j)
+				{
+					BOOST_CHECK_EQUAL(i == ft.end(), j == t.end());
+					BOOST_REQUIRE((*i).first.toBytes() == (*j).first.toBytes());
+					BOOST_REQUIRE((*i).second.toBytes() == (*j).second.toBytes());
+				}
+				BOOST_CHECK_EQUAL(ht.root(), ft.root());
+			}
+			BOOST_REQUIRE(!o["root"].is_null());
+			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ht.root().asArray()));
+			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ft.root().asArray()));
+		}
+	}
+}
+
 BOOST_AUTO_TEST_CASE(trie_test_anyorder)
 {
 	string testPath = test::getTestPath();
-- 
cgit v1.2.3


From ac0159e4dddccc7296f3e7cb6ee5200226aaa3a7 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Sun, 1 Mar 2015 22:54:05 +0100
Subject: State integration test. Fixes to the FatTrie.

---
 trie.cpp | 62 --------------------------------------------------------------
 1 file changed, 62 deletions(-)

(limited to 'trie.cpp')

diff --git a/trie.cpp b/trie.cpp
index 9e59dd31..84d0e846 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -74,68 +74,6 @@ BOOST_AUTO_TEST_CASE(fat_trie)
 	}
 }
 
-BOOST_AUTO_TEST_CASE(hex_encoded_securetrie_test)
-{
-	string testPath = test::getTestPath();
-
-	testPath += "/TrieTests";
-
-	cnote << "Testing Secure Trie...";
-	js::mValue v;
-	string s = asString(contents(testPath + "/hex_encoded_securetrie_test.json"));
-	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'hex_encoded_securetrie_test.json' is empty. Have you cloned the 'tests' repo branch develop?");
-	js::read_string(s, v);
-	for (auto& i: v.get_obj())
-	{
-		cnote << i.first;
-		js::mObject& o = i.second.get_obj();
-		vector<pair<string, string>> ss;
-		for (auto i: o["in"].get_obj())
-		{
-			ss.push_back(make_pair(i.first, i.second.get_str()));
-			if (!ss.back().first.find("0x"))
-				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
-			if (!ss.back().second.find("0x"))
-				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
-		}
-		for (unsigned j = 0; j < min(1000000000u, dev::test::fac((unsigned)ss.size())); ++j)
-		{
-			next_permutation(ss.begin(), ss.end());
-			MemoryDB m;
-			GenericTrieDB<MemoryDB> t(&m);
-			MemoryDB hm;
-			HashedGenericTrieDB<MemoryDB> ht(&hm);
-			MemoryDB fm;
-			FatGenericTrieDB<MemoryDB> ft(&fm);
-			t.init();
-			ht.init();
-			ft.init();
-			BOOST_REQUIRE(t.check(true));
-			BOOST_REQUIRE(ht.check(true));
-			BOOST_REQUIRE(ft.check(true));
-			for (auto const& k: ss)
-			{
-				t.insert(k.first, k.second);
-				ht.insert(k.first, k.second);
-				ft.insert(k.first, k.second);
-				BOOST_REQUIRE(t.check(true));
-				BOOST_REQUIRE(ht.check(true));
-				BOOST_REQUIRE(ft.check(true));
-				for (auto i = ft.begin(), j = t.begin(); i != ft.end() && j != t.end(); ++i, ++j)
-				{
-					BOOST_CHECK_EQUAL(i == ft.end(), j == t.end());
-					BOOST_REQUIRE((*i).first.toBytes() == (*j).first.toBytes());
-					BOOST_REQUIRE((*i).second.toBytes() == (*j).second.toBytes());
-				}
-				BOOST_CHECK_EQUAL(ht.root(), ft.root());
-			}
-			BOOST_REQUIRE(!o["root"].is_null());
-			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ht.root().asArray()));
-			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ft.root().asArray()));
-		}
-	}
-}
-
 BOOST_AUTO_TEST_CASE(trie_test_anyorder)
 {
 	string testPath = test::getTestPath();
-- 
cgit v1.2.3


From d774b3e188d21414c8b1c73ad660252133e2005e Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Tue, 3 Mar 2015 13:00:09 +0100
Subject: Update precompiled stuff. Add extra tests for secure trie.

---
 trie.cpp | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

(limited to 'trie.cpp')

diff --git a/trie.cpp b/trie.cpp
index 84d0e846..9e59dd31 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -74,6 +74,68 @@ BOOST_AUTO_TEST_CASE(fat_trie)
 	}
 }
 
+BOOST_AUTO_TEST_CASE(hex_encoded_securetrie_test)
+{
+	string testPath = test::getTestPath();
+
+	testPath += "/TrieTests";
+
+	cnote << "Testing Secure Trie...";
+	js::mValue v;
+	string s = asString(contents(testPath + "/hex_encoded_securetrie_test.json"));
+	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'hex_encoded_securetrie_test.json' is empty. Have you cloned the 'tests' repo branch develop?");
+	js::read_string(s, v);
+	for (auto& i: v.get_obj())
+	{
+		cnote << i.first;
+		js::mObject& o = i.second.get_obj();
+		vector<pair<string, string>> ss;
+		for (auto i: o["in"].get_obj())
+		{
+			ss.push_back(make_pair(i.first, i.second.get_str()));
+			if (!ss.back().first.find("0x"))
+				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
+			if (!ss.back().second.find("0x"))
+				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
+		}
+		for (unsigned j = 0; j < min(1000000000u, dev::test::fac((unsigned)ss.size())); ++j)
+		{
+			next_permutation(ss.begin(), ss.end());
+			MemoryDB m;
+			GenericTrieDB<MemoryDB> t(&m);
+			MemoryDB hm;
+			HashedGenericTrieDB<MemoryDB> ht(&hm);
+			MemoryDB fm;
+			FatGenericTrieDB<MemoryDB> ft(&fm);
+			t.init();
+			ht.init();
+			ft.init();
+			BOOST_REQUIRE(t.check(true));
+			BOOST_REQUIRE(ht.check(true));
+			BOOST_REQUIRE(ft.check(true));
+			for (auto const& k: ss)
+			{
+				t.insert(k.first, k.second);
+				ht.insert(k.first, k.second);
+				ft.insert(k.first, k.second);
+				BOOST_REQUIRE(t.check(true));
+				BOOST_REQUIRE(ht.check(true));
+				BOOST_REQUIRE(ft.check(true));
+				for (auto i = ft.begin(), j = t.begin(); i != ft.end() && j != t.end(); ++i, ++j)
+				{
+					BOOST_CHECK_EQUAL(i == ft.end(), j == t.end());
+					BOOST_REQUIRE((*i).first.toBytes() == (*j).first.toBytes());
+					BOOST_REQUIRE((*i).second.toBytes() == (*j).second.toBytes());
+				}
+				BOOST_CHECK_EQUAL(ht.root(), ft.root());
+			}
+			BOOST_REQUIRE(!o["root"].is_null());
+			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ht.root().asArray()));
+			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(ft.root().asArray()));
+		}
+	}
+}
+
 BOOST_AUTO_TEST_CASE(trie_test_anyorder)
 {
 	string testPath = test::getTestPath();
-- 
cgit v1.2.3


From 873d365ce535501cd1a59976b69a261bcdf9b889 Mon Sep 17 00:00:00 2001
From: CJentzsch <jentzsch.software@gmail.com>
Date: Mon, 2 Mar 2015 14:34:45 +0100
Subject: add secure trie tests

---
 trie.cpp | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)

(limited to 'trie.cpp')

diff --git a/trie.cpp b/trie.cpp
index 9e59dd31..e03e9683 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -198,6 +198,48 @@ BOOST_AUTO_TEST_CASE(trie_test_anyorder)
 	}
 }
 
+BOOST_AUTO_TEST_CASE(trie_test_anyorder_secureTrie)
+{
+	string testPath = test::getTestPath();
+
+	testPath += "/TrieTests";
+
+	cnote << "Testing Trie...";
+	js::mValue v;
+	string s = asString(contents(testPath + "/trieanyorder_secureTrie.json"));
+	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'trieanyorder.json' is empty. Have you cloned the 'tests' repo branch develop?");
+	js::read_string(s, v);
+	for (auto& i: v.get_obj())
+	{
+		cnote << i.first;
+		js::mObject& o = i.second.get_obj();
+		vector<pair<string, string>> ss;
+		for (auto i: o["in"].get_obj())
+		{
+			ss.push_back(make_pair(i.first, i.second.get_str()));
+			if (!ss.back().first.find("0x"))
+				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
+			if (!ss.back().second.find("0x"))
+				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
+		}
+		for (unsigned j = 0; j < min(1000u, dev::test::fac((unsigned)ss.size())); ++j)
+		{
+			next_permutation(ss.begin(), ss.end());
+			MemoryDB m;
+			SecureGenericTrieDB<MemoryDB> t(&m);
+			t.init();
+			BOOST_REQUIRE(t.check(true));
+			for (auto const& k: ss)
+			{
+				t.insert(k.first, k.second);
+				BOOST_REQUIRE(t.check(true));
+			}
+			BOOST_REQUIRE(!o["root"].is_null());
+			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(t.root().asArray()));
+		}
+	}
+}
+
 BOOST_AUTO_TEST_CASE(trie_tests_ordered)
 {
 	string testPath = test::getTestPath();
@@ -279,6 +321,69 @@ BOOST_AUTO_TEST_CASE(trie_tests_ordered)
 	}
 }
 
+BOOST_AUTO_TEST_CASE(trie_tests_ordered_secureTrie)
+{
+	string testPath = test::getTestPath();
+
+	testPath += "/TrieTests";
+
+	cnote << "Testing Trie...";
+	js::mValue v;
+	string s = asString(contents(testPath + "/trietest_secureTrie.json"));
+	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'trietest.json' is empty. Have you cloned the 'tests' repo branch develop?");
+	js::read_string(s, v);
+
+	for (auto& i: v.get_obj())
+	{
+		cnote << i.first;
+		js::mObject& o = i.second.get_obj();
+		vector<pair<string, string>> ss;
+		vector<string> keysToBeDeleted;
+		for (auto& i: o["in"].get_array())
+		{
+			vector<string> values;
+			for (auto& s: i.get_array())
+			{
+				if (s.type() == json_spirit::str_type)
+					values.push_back(s.get_str());
+				else if (s.type() == json_spirit::null_type)
+				{
+					// mark entry for deletion
+					values.push_back("");
+					if (!values[0].find("0x"))
+						values[0] = asString(fromHex(values[0].substr(2)));
+					keysToBeDeleted.push_back(values[0]);
+				}
+				else
+					BOOST_FAIL("Bad type (expected string)");
+			}
+
+			BOOST_REQUIRE(values.size() == 2);
+			ss.push_back(make_pair(values[0], values[1]));
+			if (!ss.back().first.find("0x"))
+				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
+			if (!ss.back().second.find("0x"))
+				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
+		}
+
+		MemoryDB m;
+		SecureGenericTrieDB<MemoryDB> t(&m);
+		t.init();
+		BOOST_REQUIRE(t.check(true));
+		for (auto const& k: ss)
+		{
+			if (find(keysToBeDeleted.begin(), keysToBeDeleted.end(), k.first) != keysToBeDeleted.end() && k.second.empty())
+				t.remove(k.first);
+			else
+				t.insert(k.first, k.second);
+			BOOST_REQUIRE(t.check(true));
+		}
+
+		BOOST_REQUIRE(!o["root"].is_null());
+		BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(t.root().asArray()));
+	}
+}
+
 inline h256 stringMapHash256(StringMap const& _s)
 {
 	return hash256(_s);
-- 
cgit v1.2.3


From f0e015843d71f2204295e678e089c18afc9258e1 Mon Sep 17 00:00:00 2001
From: CJentzsch <jentzsch.software@gmail.com>
Date: Fri, 6 Mar 2015 01:13:45 +0100
Subject: merge

---
 trie.cpp | 105 ---------------------------------------------------------------
 1 file changed, 105 deletions(-)

(limited to 'trie.cpp')

diff --git a/trie.cpp b/trie.cpp
index e03e9683..9e59dd31 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -198,48 +198,6 @@ BOOST_AUTO_TEST_CASE(trie_test_anyorder)
 	}
 }
 
-BOOST_AUTO_TEST_CASE(trie_test_anyorder_secureTrie)
-{
-	string testPath = test::getTestPath();
-
-	testPath += "/TrieTests";
-
-	cnote << "Testing Trie...";
-	js::mValue v;
-	string s = asString(contents(testPath + "/trieanyorder_secureTrie.json"));
-	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'trieanyorder.json' is empty. Have you cloned the 'tests' repo branch develop?");
-	js::read_string(s, v);
-	for (auto& i: v.get_obj())
-	{
-		cnote << i.first;
-		js::mObject& o = i.second.get_obj();
-		vector<pair<string, string>> ss;
-		for (auto i: o["in"].get_obj())
-		{
-			ss.push_back(make_pair(i.first, i.second.get_str()));
-			if (!ss.back().first.find("0x"))
-				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
-			if (!ss.back().second.find("0x"))
-				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
-		}
-		for (unsigned j = 0; j < min(1000u, dev::test::fac((unsigned)ss.size())); ++j)
-		{
-			next_permutation(ss.begin(), ss.end());
-			MemoryDB m;
-			SecureGenericTrieDB<MemoryDB> t(&m);
-			t.init();
-			BOOST_REQUIRE(t.check(true));
-			for (auto const& k: ss)
-			{
-				t.insert(k.first, k.second);
-				BOOST_REQUIRE(t.check(true));
-			}
-			BOOST_REQUIRE(!o["root"].is_null());
-			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(t.root().asArray()));
-		}
-	}
-}
-
 BOOST_AUTO_TEST_CASE(trie_tests_ordered)
 {
 	string testPath = test::getTestPath();
@@ -321,69 +279,6 @@ BOOST_AUTO_TEST_CASE(trie_tests_ordered)
 	}
 }
 
-BOOST_AUTO_TEST_CASE(trie_tests_ordered_secureTrie)
-{
-	string testPath = test::getTestPath();
-
-	testPath += "/TrieTests";
-
-	cnote << "Testing Trie...";
-	js::mValue v;
-	string s = asString(contents(testPath + "/trietest_secureTrie.json"));
-	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'trietest.json' is empty. Have you cloned the 'tests' repo branch develop?");
-	js::read_string(s, v);
-
-	for (auto& i: v.get_obj())
-	{
-		cnote << i.first;
-		js::mObject& o = i.second.get_obj();
-		vector<pair<string, string>> ss;
-		vector<string> keysToBeDeleted;
-		for (auto& i: o["in"].get_array())
-		{
-			vector<string> values;
-			for (auto& s: i.get_array())
-			{
-				if (s.type() == json_spirit::str_type)
-					values.push_back(s.get_str());
-				else if (s.type() == json_spirit::null_type)
-				{
-					// mark entry for deletion
-					values.push_back("");
-					if (!values[0].find("0x"))
-						values[0] = asString(fromHex(values[0].substr(2)));
-					keysToBeDeleted.push_back(values[0]);
-				}
-				else
-					BOOST_FAIL("Bad type (expected string)");
-			}
-
-			BOOST_REQUIRE(values.size() == 2);
-			ss.push_back(make_pair(values[0], values[1]));
-			if (!ss.back().first.find("0x"))
-				ss.back().first = asString(fromHex(ss.back().first.substr(2)));
-			if (!ss.back().second.find("0x"))
-				ss.back().second = asString(fromHex(ss.back().second.substr(2)));
-		}
-
-		MemoryDB m;
-		SecureGenericTrieDB<MemoryDB> t(&m);
-		t.init();
-		BOOST_REQUIRE(t.check(true));
-		for (auto const& k: ss)
-		{
-			if (find(keysToBeDeleted.begin(), keysToBeDeleted.end(), k.first) != keysToBeDeleted.end() && k.second.empty())
-				t.remove(k.first);
-			else
-				t.insert(k.first, k.second);
-			BOOST_REQUIRE(t.check(true));
-		}
-
-		BOOST_REQUIRE(!o["root"].is_null());
-		BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(t.root().asArray()));
-	}
-}
-
 inline h256 stringMapHash256(StringMap const& _s)
 {
 	return hash256(_s);
-- 
cgit v1.2.3