diff options
| author | chriseth <c@ethdev.com> | 2015-04-07 23:08:49 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2015-04-07 23:08:49 +0800 |
| commit | 367d0367eebd9961a2a234a7de2c29256652049d (patch) | |
| tree | a49627c646666576184d0396c38fa5e06405c9b1 /SolidityInterface.cpp | |
| parent | f5b1fec699c246d3f395a69db6dcf7e282c42113 (diff) | |
| parent | 1c13f1e4d54913da5eab604ac7434d747cb9dd0e (diff) | |
| download | dexon-solidity-367d0367eebd9961a2a234a7de2c29256652049d.tar dexon-solidity-367d0367eebd9961a2a234a7de2c29256652049d.tar.gz dexon-solidity-367d0367eebd9961a2a234a7de2c29256652049d.tar.bz2 dexon-solidity-367d0367eebd9961a2a234a7de2c29256652049d.tar.lz dexon-solidity-367d0367eebd9961a2a234a7de2c29256652049d.tar.xz dexon-solidity-367d0367eebd9961a2a234a7de2c29256652049d.tar.zst dexon-solidity-367d0367eebd9961a2a234a7de2c29256652049d.zip | |
Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions
Diffstat (limited to 'SolidityInterface.cpp')
| -rw-r--r-- | SolidityInterface.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/SolidityInterface.cpp b/SolidityInterface.cpp index ecab64c8..c836f0fa 100644 --- a/SolidityInterface.cpp +++ b/SolidityInterface.cpp @@ -20,6 +20,8 @@ * Unit tests for generating source interfaces for Solidity contracts. */ +#if ETH_SOLIDITY + #include "TestHelper.h" #include <libsolidity/CompilerStack.h> #include <libsolidity/AST.h> @@ -84,10 +86,10 @@ BOOST_AUTO_TEST_CASE(single_function) BOOST_AUTO_TEST_CASE(single_constant_function) { ContractDefinition const& contract = checkInterface( - "contract test { function f(uint a) constant returns(hash8 x) { 1==2; } }"); + "contract test { function f(uint a) constant returns(bytes1 x) { 1==2; } }"); BOOST_REQUIRE_EQUAL(1, contract.getDefinedFunctions().size()); BOOST_CHECK_EQUAL(getSourcePart(*contract.getDefinedFunctions().front()), - "function f(uint256 a)constant returns(hash8 x){}"); + "function f(uint256 a)constant returns(bytes1 x){}"); } BOOST_AUTO_TEST_CASE(multiple_functions) @@ -128,15 +130,15 @@ BOOST_AUTO_TEST_CASE(inheritance) char const* sourceCode = " contract Base { \n" " function baseFunction(uint p) returns (uint i) { return p; } \n" - " event baseEvent(string32 indexed evtArgBase); \n" + " event baseEvent(bytes32 indexed evtArgBase); \n" " } \n" " contract Derived is Base { \n" - " function derivedFunction(string32 p) returns (string32 i) { return p; } \n" + " function derivedFunction(bytes32 p) returns (bytes32 i) { return p; } \n" " event derivedEvent(uint indexed evtArgDerived); \n" " }"; ContractDefinition const& contract = checkInterface(sourceCode); set<string> expectedFunctions({"function baseFunction(uint256 p)returns(uint256 i){}", - "function derivedFunction(string32 p)returns(string32 i){}"}); + "function derivedFunction(bytes32 p)returns(bytes32 i){}"}); BOOST_REQUIRE_EQUAL(2, contract.getDefinedFunctions().size()); BOOST_CHECK(expectedFunctions == set<string>({getSourcePart(*contract.getDefinedFunctions().at(0)), getSourcePart(*contract.getDefinedFunctions().at(1))})); @@ -147,3 +149,5 @@ BOOST_AUTO_TEST_SUITE_END() } } } + +#endif |