diff options
| author | chriseth <chris@ethereum.org> | 2018-08-09 06:29:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-09 06:29:40 +0800 |
| commit | 5cd5a9652cfef6b6b318916ae74cd290b69f5187 (patch) | |
| tree | a3396e696e8c144ceb6e6a682cc286657a03ddcc /test | |
| parent | cbd64e0e1183869671b394ea98b774f7b7445665 (diff) | |
| parent | ed52f422b78b262c6d0e2e88b45e6cbeec470dc7 (diff) | |
| download | dexon-solidity-5cd5a9652cfef6b6b318916ae74cd290b69f5187.tar dexon-solidity-5cd5a9652cfef6b6b318916ae74cd290b69f5187.tar.gz dexon-solidity-5cd5a9652cfef6b6b318916ae74cd290b69f5187.tar.bz2 dexon-solidity-5cd5a9652cfef6b6b318916ae74cd290b69f5187.tar.lz dexon-solidity-5cd5a9652cfef6b6b318916ae74cd290b69f5187.tar.xz dexon-solidity-5cd5a9652cfef6b6b318916ae74cd290b69f5187.tar.zst dexon-solidity-5cd5a9652cfef6b6b318916ae74cd290b69f5187.zip | |
Merge pull request #4775 from ethereum/sha3-to-keccak256
Rename FunctionKind SHA3 to KECCAK256 (as the instruction was renamed in libevmasm)
Diffstat (limited to 'test')
| -rw-r--r-- | test/libsolidity/SolidityTypes.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/libsolidity/SolidityTypes.cpp b/test/libsolidity/SolidityTypes.cpp index db0e3b66..e171d974 100644 --- a/test/libsolidity/SolidityTypes.cpp +++ b/test/libsolidity/SolidityTypes.cpp @@ -195,11 +195,11 @@ BOOST_AUTO_TEST_CASE(type_identifiers) TupleType t({e.type(), s.type(), stringArray, nullptr}); BOOST_CHECK_EQUAL(t.identifier(), "t_tuple$_t_type$_t_enum$_Enum_$4_$_$_t_type$_t_struct$_Struct_$3_storage_ptr_$_$_t_array$_t_string_storage_$20_storage_ptr_$__$"); - TypePointer sha3fun = make_shared<FunctionType>(strings{}, strings{}, FunctionType::Kind::SHA3); - BOOST_CHECK_EQUAL(sha3fun->identifier(), "t_function_sha3_nonpayable$__$returns$__$"); + TypePointer keccak256fun = make_shared<FunctionType>(strings{}, strings{}, FunctionType::Kind::KECCAK256); + BOOST_CHECK_EQUAL(keccak256fun->identifier(), "t_function_keccak256_nonpayable$__$returns$__$"); - FunctionType metaFun(TypePointers{sha3fun}, TypePointers{s.type()}); - BOOST_CHECK_EQUAL(metaFun.identifier(), "t_function_internal_nonpayable$_t_function_sha3_nonpayable$__$returns$__$_$returns$_t_type$_t_struct$_Struct_$3_storage_ptr_$_$"); + FunctionType metaFun(TypePointers{keccak256fun}, TypePointers{s.type()}); + BOOST_CHECK_EQUAL(metaFun.identifier(), "t_function_internal_nonpayable$_t_function_keccak256_nonpayable$__$returns$__$_$returns$_t_type$_t_struct$_Struct_$3_storage_ptr_$_$"); TypePointer m = make_shared<MappingType>(Type::fromElementaryTypeName("bytes32"), s.type()); MappingType m2(Type::fromElementaryTypeName("uint64"), m); |