diff options
| author | subtly <subtly@users.noreply.github.com> | 2015-04-15 04:49:03 +0800 |
|---|---|---|
| committer | subtly <subtly@users.noreply.github.com> | 2015-04-15 04:49:03 +0800 |
| commit | 45019f74db74650b7523a2469c178e1db854d827 (patch) | |
| tree | 7d54b6b3f94f8b02b13b2344c977231dfca552a4 /dagger.cpp | |
| parent | c4eea88b3f52454a91eb97f1efff6755004c2fca (diff) | |
| parent | 2d1a50ce2856e6d5d1f2123dd39e5a73f2ede9ad (diff) | |
| download | dexon-solidity-45019f74db74650b7523a2469c178e1db854d827.tar dexon-solidity-45019f74db74650b7523a2469c178e1db854d827.tar.gz dexon-solidity-45019f74db74650b7523a2469c178e1db854d827.tar.bz2 dexon-solidity-45019f74db74650b7523a2469c178e1db854d827.tar.lz dexon-solidity-45019f74db74650b7523a2469c178e1db854d827.tar.xz dexon-solidity-45019f74db74650b7523a2469c178e1db854d827.tar.zst dexon-solidity-45019f74db74650b7523a2469c178e1db854d827.zip | |
Merge branch 'develop' into netFix
Diffstat (limited to 'dagger.cpp')
| -rw-r--r-- | dagger.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -25,7 +25,7 @@ #include "JsonSpiritHeaders.h" #include <libdevcore/CommonIO.h> #include <libethcore/ProofOfWork.h> -#include <libethcore/Ethasher.h> +#include <libethcore/EthashAux.h> #include <boost/test/unit_test.hpp> #include "TestHelper.h" @@ -63,18 +63,18 @@ 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()->params(header).cache_size, cacheSize); - BOOST_REQUIRE_EQUAL(sha3(bytesConstRef((byte const*)Ethasher::get()->light(header), cacheSize)), cacheHash); + BOOST_REQUIRE_EQUAL(EthashAux::get()->params(header).cache_size, cacheSize); + BOOST_REQUIRE_EQUAL(sha3(bytesConstRef((byte const*)EthashAux::get()->light(header), cacheSize)), cacheHash); #if TEST_FULL unsigned fullSize(o["full_size"].get_int()); h256 fullHash(o["full_hash"].get_str()); - BOOST_REQUIRE_EQUAL(Ethasher::get()->full(header).size(), fullSize); - BOOST_REQUIRE_EQUAL(sha3(Ethasher::get()->full(header)), fullHash); + BOOST_REQUIRE_EQUAL(EthashAux::get()->full(header).size(), fullSize); + BOOST_REQUIRE_EQUAL(sha3(EthashAux::get()->full(header)), fullHash); #endif h256 result(o["result"].get_str()); - Ethasher::Result r = Ethasher::eval(header); + Ethash::Result r = EthashAux::eval(header); BOOST_REQUIRE_EQUAL(r.value, result); BOOST_REQUIRE_EQUAL(r.mixHash, header.mixHash); } |