Merge remote-tracking branch 'upstream/develop' into addTests

Conflicts:
	test/ttTransactionTestFiller.json

1 files changed, 2 insertions, 2 deletions

diff --git a/dagger.cpp b/dagger.cpp
index f7230f70..4dda9c4f 100644
--- a/dagger.cpp
+++ b/dagger.cpp
@@ -63,8 +63,8 @@ BOOST_AUTO_TEST_CASE(basic_test)
 
 		unsigned cacheSize(o["cache_size"].get_int());
 		h256 cacheHash(o["cache_hash"].get_str());
-		BOOST_REQUIRE_EQUAL(Ethasher::get()->cache(header).size(), cacheSize);
-		BOOST_REQUIRE_EQUAL(sha3(Ethasher::get()->cache(header)), cacheHash);
+		BOOST_REQUIRE_EQUAL(Ethasher::get()->params(header).cache_size, cacheSize);
+		BOOST_REQUIRE_EQUAL(sha3(bytesConstRef((byte const*)Ethasher::get()->cache(header), cacheSize)), cacheHash);
 
 #if TEST_FULL
 		unsigned fullSize(o["full_size"].get_int());