diff options
| author | Bob Summerwill <bob@summerwill.net> | 2016-08-01 16:47:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-01 16:47:51 +0800 |
| commit | 8c5a56d8648c9722d96638bf6dc1be94c7828cb3 (patch) | |
| tree | b680926d0da4aadfddae0db9567557802f2c2929 /test/libsolidity/SolidityEndToEndTest.cpp | |
| parent | 56727d61a61e1485c8360f00700d766632ec7163 (diff) | |
| parent | 4ee2114127f87b08b76b3ca94cde80a49cdc056a (diff) | |
| download | dexon-solidity-8c5a56d8648c9722d96638bf6dc1be94c7828cb3.tar dexon-solidity-8c5a56d8648c9722d96638bf6dc1be94c7828cb3.tar.gz dexon-solidity-8c5a56d8648c9722d96638bf6dc1be94c7828cb3.tar.bz2 dexon-solidity-8c5a56d8648c9722d96638bf6dc1be94c7828cb3.tar.lz dexon-solidity-8c5a56d8648c9722d96638bf6dc1be94c7828cb3.tar.xz dexon-solidity-8c5a56d8648c9722d96638bf6dc1be94c7828cb3.tar.zst dexon-solidity-8c5a56d8648c9722d96638bf6dc1be94c7828cb3.zip | |
Merge pull request #770 from bobsummerwill/standalone_changes
Make the Solidity repository standalone
Diffstat (limited to 'test/libsolidity/SolidityEndToEndTest.cpp')
| -rw-r--r-- | test/libsolidity/SolidityEndToEndTest.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index 4b634649..1b7c5ea4 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -21,6 +21,7 @@ * Unit tests for the solidity expression compiler, testing the behaviour of the code. */ +#include <functional> #include <string> #include <tuple> #include <boost/test/unit_test.hpp> @@ -29,6 +30,7 @@ #include <test/libsolidity/SolidityExecutionFramework.h> using namespace std; +using namespace std::placeholders; namespace dev { @@ -2462,7 +2464,7 @@ BOOST_AUTO_TEST_CASE(use_std_lib) contract Icarus is mortal { } )"; m_addStandardSources = true; - u256 amount(130 * eth::ether); + u256 amount(130 * ether); compileAndRun(sourceCode, amount, "Icarus"); u256 balanceBefore = balanceAt(m_sender); BOOST_CHECK(callContractFunction("kill()") == bytes()); @@ -5921,9 +5923,9 @@ BOOST_AUTO_TEST_CASE(version_stamp_for_libraries) m_optimize = true; bytes runtimeCode = compileAndRun(sourceCode, 0, "lib"); BOOST_CHECK(runtimeCode.size() >= 8); - BOOST_CHECK_EQUAL(runtimeCode[0], int(eth::Instruction::PUSH6)); // might change once we switch to 1.x.x + BOOST_CHECK_EQUAL(runtimeCode[0], int(Instruction::PUSH6)); // might change once we switch to 1.x.x BOOST_CHECK_EQUAL(runtimeCode[1], 3); // might change once we switch away from x.3.x - BOOST_CHECK_EQUAL(runtimeCode[7], int(eth::Instruction::POP)); + BOOST_CHECK_EQUAL(runtimeCode[7], int(Instruction::POP)); } BOOST_AUTO_TEST_CASE(contract_binary_dependencies) |