diff options
| author | chriseth <chris@ethereum.org> | 2018-04-03 17:10:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-03 17:10:55 +0800 |
| commit | d21382157cbda53d98f3a4e0d7c0d0a7d213aebf (patch) | |
| tree | 572a9a876d02f6d7c62196aff3a040c9abc822d2 /test | |
| parent | 3d0b99731fbfe1b2bfadc21ed46bcdf7e8ad0713 (diff) | |
| parent | e37b619593cc926873279dc1d5f532a7a13b6fa4 (diff) | |
| download | dexon-solidity-d21382157cbda53d98f3a4e0d7c0d0a7d213aebf.tar dexon-solidity-d21382157cbda53d98f3a4e0d7c0d0a7d213aebf.tar.gz dexon-solidity-d21382157cbda53d98f3a4e0d7c0d0a7d213aebf.tar.bz2 dexon-solidity-d21382157cbda53d98f3a4e0d7c0d0a7d213aebf.tar.lz dexon-solidity-d21382157cbda53d98f3a4e0d7c0d0a7d213aebf.tar.xz dexon-solidity-d21382157cbda53d98f3a4e0d7c0d0a7d213aebf.tar.zst dexon-solidity-d21382157cbda53d98f3a4e0d7c0d0a7d213aebf.zip | |
Merge pull request #3801 from meowingtwurtle/preFixedPoint
Set default fixed point decimal places to 18
Diffstat (limited to 'test')
| -rw-r--r-- | test/libsolidity/SolidityNameAndTypeResolution.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp index dd29bf48..f18c906d 100644 --- a/test/libsolidity/SolidityNameAndTypeResolution.cpp +++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp @@ -2452,8 +2452,8 @@ BOOST_AUTO_TEST_CASE(test_fromElementaryTypeName) BOOST_CHECK(*Type::fromElementaryTypeName(ElementaryTypeNameToken(Token::BytesM, 31, 0)) == *make_shared<FixedBytesType>(31)); BOOST_CHECK(*Type::fromElementaryTypeName(ElementaryTypeNameToken(Token::BytesM, 32, 0)) == *make_shared<FixedBytesType>(32)); - BOOST_CHECK(*Type::fromElementaryTypeName(ElementaryTypeNameToken(Token::Fixed, 0, 0)) == *make_shared<FixedPointType>(128, 19, FixedPointType::Modifier::Signed)); - BOOST_CHECK(*Type::fromElementaryTypeName(ElementaryTypeNameToken(Token::UFixed, 0, 0)) == *make_shared<FixedPointType>(128, 19, FixedPointType::Modifier::Unsigned)); + BOOST_CHECK(*Type::fromElementaryTypeName(ElementaryTypeNameToken(Token::Fixed, 0, 0)) == *make_shared<FixedPointType>(128, 18, FixedPointType::Modifier::Signed)); + BOOST_CHECK(*Type::fromElementaryTypeName(ElementaryTypeNameToken(Token::UFixed, 0, 0)) == *make_shared<FixedPointType>(128, 18, FixedPointType::Modifier::Unsigned)); } BOOST_AUTO_TEST_CASE(test_byte_is_alias_of_byte1) @@ -4471,7 +4471,7 @@ BOOST_AUTO_TEST_CASE(invalid_int_implicit_conversion_from_fixed) } } )"; - CHECK_ERROR(text, TypeError, "Type fixed128x19 is not implicitly convertible to expected type int256"); + CHECK_ERROR(text, TypeError, "Type fixed128x18 is not implicitly convertible to expected type int256"); } BOOST_AUTO_TEST_CASE(rational_unary_operation) @@ -4589,7 +4589,7 @@ BOOST_AUTO_TEST_CASE(fixed_type_invalid_implicit_conversion_size) } } )"; - CHECK_ERROR(text, TypeError, "Type ufixed128x19 is not implicitly convertible to expected type ufixed248x8"); + CHECK_ERROR(text, TypeError, "Type ufixed128x18 is not implicitly convertible to expected type ufixed248x8"); } BOOST_AUTO_TEST_CASE(fixed_type_invalid_implicit_conversion_lost_data) @@ -4676,7 +4676,7 @@ BOOST_AUTO_TEST_CASE(fixed_to_bytes_implicit_conversion) } } )"; - CHECK_ERROR(text, TypeError, "fixed128x19 is not implicitly convertible to expected type bytes32"); + CHECK_ERROR(text, TypeError, "fixed128x18 is not implicitly convertible to expected type bytes32"); } BOOST_AUTO_TEST_CASE(mapping_with_fixed_literal) |