diff options
| author | chriseth <chris@ethereum.org> | 2016-08-25 01:41:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-25 01:41:12 +0800 |
| commit | d5e4b7492ebf28182d71e2bbc9aece24e4e16182 (patch) | |
| tree | 494a6dcbd784ec1502d4fa3733171fa220f61293 /test | |
| parent | e20afc71ce6ac16edc2fdbd301d7698da8d34c04 (diff) | |
| parent | 23acb383d578735b85318217fddd94809336c9b2 (diff) | |
| download | dexon-solidity-d5e4b7492ebf28182d71e2bbc9aece24e4e16182.tar dexon-solidity-d5e4b7492ebf28182d71e2bbc9aece24e4e16182.tar.gz dexon-solidity-d5e4b7492ebf28182d71e2bbc9aece24e4e16182.tar.bz2 dexon-solidity-d5e4b7492ebf28182d71e2bbc9aece24e4e16182.tar.lz dexon-solidity-d5e4b7492ebf28182d71e2bbc9aece24e4e16182.tar.xz dexon-solidity-d5e4b7492ebf28182d71e2bbc9aece24e4e16182.tar.zst dexon-solidity-d5e4b7492ebf28182d71e2bbc9aece24e4e16182.zip | |
Merge pull request #928 from winsvega/solremove
remove sha256 and rmd160 hash
Diffstat (limited to 'test')
| -rw-r--r-- | test/contracts/AuctionRegistrar.cpp | 1 | ||||
| -rw-r--r-- | test/contracts/FixedFeeRegistrar.cpp | 1 | ||||
| -rw-r--r-- | test/contracts/Wallet.cpp | 1 | ||||
| -rw-r--r-- | test/libsolidity/SolidityEndToEndTest.cpp | 21 |
4 files changed, 16 insertions, 8 deletions
diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp index 8860727d..bb2e5663 100644 --- a/test/contracts/AuctionRegistrar.cpp +++ b/test/contracts/AuctionRegistrar.cpp @@ -24,7 +24,6 @@ #include <tuple> #include <boost/test/unit_test.hpp> #include <libdevcore/ABI.h> -#include <libdevcore/Hash.h> #include <test/libsolidity/SolidityExecutionFramework.h> using namespace std; diff --git a/test/contracts/FixedFeeRegistrar.cpp b/test/contracts/FixedFeeRegistrar.cpp index 63db0531..6d79bec6 100644 --- a/test/contracts/FixedFeeRegistrar.cpp +++ b/test/contracts/FixedFeeRegistrar.cpp @@ -32,7 +32,6 @@ #pragma warning(pop) #endif -#include <libdevcore/Hash.h> #include <test/libsolidity/SolidityExecutionFramework.h> using namespace std; diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp index 27bdb396..7a9b0b17 100644 --- a/test/contracts/Wallet.cpp +++ b/test/contracts/Wallet.cpp @@ -32,7 +32,6 @@ #pragma warning(pop) #endif -#include <libdevcore/Hash.h> #include <test/libsolidity/SolidityExecutionFramework.h> using namespace std; diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index 4e6f68b0..45f6aec5 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -25,7 +25,6 @@ #include <string> #include <tuple> #include <boost/test/unit_test.hpp> -#include <libdevcore/Hash.h> #include <libsolidity/interface/Exceptions.h> #include <test/libsolidity/SolidityExecutionFramework.h> @@ -1700,9 +1699,15 @@ BOOST_AUTO_TEST_CASE(sha256) " }\n" "}\n"; compileAndRun(sourceCode); - auto f = [&](u256 const& _input) -> u256 + auto f = [&](u256 const& _x) -> bytes { - return dev::sha256(dev::ref(toBigEndian(_input))); + if (_x == u256(4)) + return fromHex("e38990d0c7fc009880a9c07c23842e886c6bbdc964ce6bdd5817ad357335ee6f"); + if (_x == u256(5)) + return fromHex("96de8fc8c256fa1e1556d41af431cace7dca68707c78dd88c3acab8b17164c47"); + if (_x == u256(-1)) + return fromHex("af9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051"); + return fromHex(""); }; testSolidityAgainstCpp("a(bytes32)", f, u256(4)); testSolidityAgainstCpp("a(bytes32)", f, u256(5)); @@ -1717,9 +1722,15 @@ BOOST_AUTO_TEST_CASE(ripemd) " }\n" "}\n"; compileAndRun(sourceCode); - auto f = [&](u256 const& _input) -> u256 + auto f = [&](u256 const& _x) -> bytes { - return h256(dev::ripemd160(h256(_input).ref()), h256::AlignLeft); // This should be aligned right. i guess it's fixed elsewhere? + if (_x == u256(4)) + return fromHex("1b0f3c404d12075c68c938f9f60ebea4f74941a0000000000000000000000000"); + if (_x == u256(5)) + return fromHex("ee54aa84fc32d8fed5a5fe160442ae84626829d9000000000000000000000000"); + if (_x == u256(-1)) + return fromHex("1cf4e77f5966e13e109703cd8a0df7ceda7f3dc3000000000000000000000000"); + return fromHex(""); }; testSolidityAgainstCpp("a(bytes32)", f, u256(4)); testSolidityAgainstCpp("a(bytes32)", f, u256(5)); |