From 8e84acb98be04d4e4511ccf07bb68126b9b5670a Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 9 Jan 2015 11:51:52 +0100 Subject: [PATCH] Buildfix after semantical merge conflict. --- libsolidity/InterfaceHandler.cpp | 3 ++- test/SolidityEndToEndTest.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libsolidity/InterfaceHandler.cpp b/libsolidity/InterfaceHandler.cpp index ca805fc9a..4ce6e989a 100644 --- a/libsolidity/InterfaceHandler.cpp +++ b/libsolidity/InterfaceHandler.cpp @@ -70,8 +70,9 @@ std::unique_ptr InterfaceHandler::getABIInterface(ContractDefinitio unique_ptr InterfaceHandler::getABISolidityInterface(ContractDefinition const& _contractDef) { string ret = "contract " + _contractDef.getName() + "{"; - for (FunctionDefinition const* f: _contractDef.getInterfaceFunctions()) + for (auto const& it: _contractDef.getInterfaceFunctions()) { + FunctionDefinition const* f = it.second; auto populateParameters = [](vector> const& _vars) { string r = ""; diff --git a/test/SolidityEndToEndTest.cpp b/test/SolidityEndToEndTest.cpp index a9b7ff90a..1ddd26f75 100644 --- a/test/SolidityEndToEndTest.cpp +++ b/test/SolidityEndToEndTest.cpp @@ -860,7 +860,7 @@ BOOST_AUTO_TEST_CASE(log0) u256 amount(130); compileAndRun(sourceCode, amount + 1); u160 address(23); - callContractFunction(0, address, amount); + callContractFunction("a()", address, amount); BOOST_CHECK_EQUAL(m_logs.size(), 1); BOOST_CHECK_EQUAL(m_logs[0].address, m_contractAddress); BOOST_CHECK_EQUAL(h256(m_logs[0].data), h256(u256(1))); @@ -877,7 +877,7 @@ BOOST_AUTO_TEST_CASE(log1) u256 amount(130); compileAndRun(sourceCode, amount + 1); u160 address(23); - callContractFunction(0, address, amount); + callContractFunction("a()", address, amount); BOOST_CHECK_EQUAL(m_logs.size(), 1); BOOST_CHECK_EQUAL(m_logs[0].address, m_contractAddress); BOOST_CHECK_EQUAL(h256(m_logs[0].data), h256(u256(1))); @@ -895,7 +895,7 @@ BOOST_AUTO_TEST_CASE(log2) u256 amount(130); compileAndRun(sourceCode, amount + 1); u160 address(23); - callContractFunction(0, address, amount); + callContractFunction("a()", address, amount); BOOST_CHECK_EQUAL(m_logs.size(), 1); BOOST_CHECK_EQUAL(m_logs[0].address, m_contractAddress); BOOST_CHECK_EQUAL(h256(m_logs[0].data), h256(u256(1))); @@ -914,7 +914,7 @@ BOOST_AUTO_TEST_CASE(log3) u256 amount(130); compileAndRun(sourceCode, amount + 1); u160 address(23); - callContractFunction(0, address, amount); + callContractFunction("a()", address, amount); BOOST_CHECK_EQUAL(m_logs.size(), 1); BOOST_CHECK_EQUAL(m_logs[0].address, m_contractAddress); BOOST_CHECK_EQUAL(h256(m_logs[0].data), h256(u256(1))); @@ -933,7 +933,7 @@ BOOST_AUTO_TEST_CASE(log4) u256 amount(130); compileAndRun(sourceCode, amount + 1); u160 address(23); - callContractFunction(0, address, amount); + callContractFunction("a()", address, amount); BOOST_CHECK_EQUAL(m_logs.size(), 1); BOOST_CHECK_EQUAL(m_logs[0].address, m_contractAddress); BOOST_CHECK_EQUAL(h256(m_logs[0].data), h256(u256(1)));