diff options
| author | winsvega <winsvega@mail.ru> | 2015-02-20 18:49:32 +0800 |
|---|---|---|
| committer | winsvega <winsvega@mail.ru> | 2015-02-20 18:49:32 +0800 |
| commit | 853cf07e43c2ce331f2b2327fc4d585bd69c9f7e (patch) | |
| tree | 358ee1b4c193128b8a7def4561a68a6a3ba1cf48 | |
| parent | e832fec8d5a82fe8e6dc0428f78a4ad755e6aa08 (diff) | |
| parent | 3e79e23841670c27ceba34bce2d0715a7ef4a136 (diff) | |
| download | dexon-solidity-853cf07e43c2ce331f2b2327fc4d585bd69c9f7e.tar.gz dexon-solidity-853cf07e43c2ce331f2b2327fc4d585bd69c9f7e.tar.zst dexon-solidity-853cf07e43c2ce331f2b2327fc4d585bd69c9f7e.zip | |
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop
| -rw-r--r-- | SolidityNameAndTypeResolution.cpp | 13 | ||||
| -rw-r--r-- | whisperTopic.cpp | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/SolidityNameAndTypeResolution.cpp b/SolidityNameAndTypeResolution.cpp index bfef873c..da6c2a88 100644 --- a/SolidityNameAndTypeResolution.cpp +++ b/SolidityNameAndTypeResolution.cpp @@ -1163,6 +1163,19 @@ BOOST_AUTO_TEST_CASE(external_argument_delete) BOOST_CHECK_THROW(parseTextAndResolveNames(sourceCode), TypeError); } +BOOST_AUTO_TEST_CASE(test_for_bug_override_function_with_bytearray_type) +{ + char const* sourceCode = R"( + contract Vehicle { + function f(bytes _a) external returns (uint256 r) {r = 1;} + } + contract Bike is Vehicle { + function f(bytes _a) external returns (uint256 r) {r = 42;} + } + )"; + BOOST_CHECK_NO_THROW(parseTextAndResolveNamesWithChecks(sourceCode)); +} + BOOST_AUTO_TEST_SUITE_END() } diff --git a/whisperTopic.cpp b/whisperTopic.cpp index be93174e..4609c957 100644 --- a/whisperTopic.cpp +++ b/whisperTopic.cpp @@ -30,6 +30,7 @@ using namespace dev::shh; BOOST_AUTO_TEST_SUITE(whisper) +#if ALEX_HASH_FIXED_NETWORKING BOOST_AUTO_TEST_CASE(topic) { cnote << "Testing Whisper..."; @@ -293,5 +294,6 @@ BOOST_AUTO_TEST_CASE(asyncforwarding) BOOST_REQUIRE_EQUAL(result, 1); } +#endif BOOST_AUTO_TEST_SUITE_END() |