aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2015-01-29 21:53:10 +0800
committerchriseth <c@ethdev.com>2015-01-29 21:53:10 +0800
commitd6e77f193a83a83659749c17af173590550cd170 (patch)
tree604d121ced5a5f1a4bc31c097bbc2e9cb7bcb242
parent8c27fccae9c10c78292dc7c9a3a2d73e33a2efde (diff)
parentbdb446267332d924eb347eb138bc5f68a460b43f (diff)
downloaddexon-solidity-d6e77f193a83a83659749c17af173590550cd170.tar
dexon-solidity-d6e77f193a83a83659749c17af173590550cd170.tar.gz
dexon-solidity-d6e77f193a83a83659749c17af173590550cd170.tar.bz2
dexon-solidity-d6e77f193a83a83659749c17af173590550cd170.tar.lz
dexon-solidity-d6e77f193a83a83659749c17af173590550cd170.tar.xz
dexon-solidity-d6e77f193a83a83659749c17af173590550cd170.tar.zst
dexon-solidity-d6e77f193a83a83659749c17af173590550cd170.zip
Merge pull request #889 from LefterisJP/sol_ExprCompilerEncapsulation
No longer exposing retrieveValueFromStorage() as a public function
-rw-r--r--SolidityEndToEndTest.cpp2
-rw-r--r--SolidityNameAndTypeResolution.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/SolidityEndToEndTest.cpp b/SolidityEndToEndTest.cpp
index 9f7a72a4..f2976707 100644
--- a/SolidityEndToEndTest.cpp
+++ b/SolidityEndToEndTest.cpp
@@ -916,7 +916,7 @@ BOOST_AUTO_TEST_CASE(multiple_elementary_accessors)
BOOST_CHECK(callContractFunction("name()") == encodeArgs("Celina"));
BOOST_CHECK(callContractFunction("a_hash()") == encodeArgs(dev::sha3(toBigEndian(u256(123)))));
BOOST_CHECK(callContractFunction("an_address()") == encodeArgs(toBigEndian(u160(0x1337))));
- BOOST_CHECK(!(callContractFunction("super_secret_data()") == encodeArgs(42)));
+ BOOST_CHECK(callContractFunction("super_secret_data()") == bytes());
}
BOOST_AUTO_TEST_CASE(balance)
diff --git a/SolidityNameAndTypeResolution.cpp b/SolidityNameAndTypeResolution.cpp
index 979836ec..5ae854bc 100644
--- a/SolidityNameAndTypeResolution.cpp
+++ b/SolidityNameAndTypeResolution.cpp
@@ -644,7 +644,7 @@ BOOST_AUTO_TEST_CASE(state_variable_accessors)
BOOST_CHECK_NO_THROW(source = parseTextAndResolveNamesWithChecks(text));
BOOST_REQUIRE((contract = retrieveContract(source, 0)) != nullptr);
FunctionDescription function = retrieveFunctionBySignature(contract, "foo()");
- BOOST_CHECK_MESSAGE(function.getDeclaration() != nullptr, "Could not find the accessor function");
+ BOOST_REQUIRE(function.getDeclaration() != nullptr);
auto returnParams = function.getReturnParameters();
BOOST_CHECK_EQUAL(returnParams.at(0).getType(), "uint256");
BOOST_CHECK(function.isConstant());