For Marek :)

BlockChain::transaction(h256 _transactionHash)
BlockChain::transactionHashes(h256 _blockHash)

1 files changed, 10 insertions, 12 deletions

diff --git a/dagger.cpp b/dagger.cpp
index 720abbba..dec753fe 100644
--- a/dagger.cpp
+++ b/dagger.cpp
@@ -41,16 +41,16 @@ BOOST_AUTO_TEST_SUITE(DashimotoTests)
 
 BOOST_AUTO_TEST_CASE(basic_test)
 {
-#if 0
-	cnote << "Testing ProofOfWork...";
-	// Test dagger
-	{
-		auto s = steady_clock::now();
-		cout << hex << ProofOfWork().eval((h256)(u256)1, (h256)(u256)0);
-		cout << " " << dec << duration_cast<milliseconds>(steady_clock::now() - s).count() << " ms" << endl;
-		cout << hex << ProofOfWork().eval((h256)(u256)1, (h256)(u256)1);
-		cout << " " << dec << duration_cast<milliseconds>(steady_clock::now() - s).count() << " ms" << endl;
-	}
+	string testPath = test::getTestPath();
+
+	testPath += "/PoWTests";
+
+	cnote << "Testing Secure Trie...";
+	js::mValue v;
+	string s = asString(contents(testPath + "/ethash_tests.json"));
+	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'ethash_tests.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();
@@ -78,8 +78,6 @@ BOOST_AUTO_TEST_CASE(basic_test)
 		BOOST_REQUIRE_EQUAL(r.value, result);
 		BOOST_REQUIRE_EQUAL(r.mixHash, header.mixHash);
 	}
-#endif
-	return 0;
 }
 
 BOOST_AUTO_TEST_SUITE_END()