diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2014-10-17 21:49:27 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2014-10-17 21:49:27 +0800 |
| commit | d5502aee4866b8f321a85d1bd9b320cf574f5378 (patch) | |
| tree | 0c9cad6262f7f0ff0a1769d89238f7820d5a2573 /jsonrpc.cpp | |
| parent | 31359aa253317b50bc47e1f8468977918bcbd4a4 (diff) | |
| parent | 693fe08bc996ff8403c75a770a735916dae4fc5b (diff) | |
| download | dexon-solidity-d5502aee4866b8f321a85d1bd9b320cf574f5378.tar dexon-solidity-d5502aee4866b8f321a85d1bd9b320cf574f5378.tar.gz dexon-solidity-d5502aee4866b8f321a85d1bd9b320cf574f5378.tar.bz2 dexon-solidity-d5502aee4866b8f321a85d1bd9b320cf574f5378.tar.lz dexon-solidity-d5502aee4866b8f321a85d1bd9b320cf574f5378.tar.xz dexon-solidity-d5502aee4866b8f321a85d1bd9b320cf574f5378.tar.zst dexon-solidity-d5502aee4866b8f321a85d1bd9b320cf574f5378.zip | |
Merge branch 'develop' into mk_jsonrpc
Conflicts:
libqethereum/QEthereum.h
Diffstat (limited to 'jsonrpc.cpp')
| -rw-r--r-- | jsonrpc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jsonrpc.cpp b/jsonrpc.cpp index 0e14fab8..72cbc9f0 100644 --- a/jsonrpc.cpp +++ b/jsonrpc.cpp @@ -254,7 +254,7 @@ BOOST_AUTO_TEST_CASE(jsonrpc_sha3) cnote << "Testing jsonrpc sha3..."; string testString = "1234567890987654"; string sha3 = jsonrpcClient->sha3(testString); - BOOST_CHECK_EQUAL(jsToFixed<32>(sha3), dev::eth::sha3(jsToBytes(testString))); + BOOST_CHECK_EQUAL(jsToFixed<32>(sha3), dev::sha3(jsToBytes(testString))); } BOOST_AUTO_TEST_CASE(jsonrpc_stateAt) |