diff options
| author | Gav Wood <i@gavwood.com> | 2015-07-20 23:54:52 +0800 |
|---|---|---|
| committer | Gav Wood <i@gavwood.com> | 2015-07-20 23:54:52 +0800 |
| commit | 189b298ae1522c02aeb0fbab035682ad9294d788 (patch) | |
| tree | 4904f093b04e01779af71f8ef04483df25bb5cfb | |
| parent | 64031d7119aecf8d1508ac18ca93f3b773129520 (diff) | |
| parent | 4046174ea2120e40d87150bfeab51de8e78875e1 (diff) | |
| download | dexon-solidity-189b298ae1522c02aeb0fbab035682ad9294d788.tar dexon-solidity-189b298ae1522c02aeb0fbab035682ad9294d788.tar.gz dexon-solidity-189b298ae1522c02aeb0fbab035682ad9294d788.tar.bz2 dexon-solidity-189b298ae1522c02aeb0fbab035682ad9294d788.tar.lz dexon-solidity-189b298ae1522c02aeb0fbab035682ad9294d788.tar.xz dexon-solidity-189b298ae1522c02aeb0fbab035682ad9294d788.tar.zst dexon-solidity-189b298ae1522c02aeb0fbab035682ad9294d788.zip | |
Merge branch 'whizz' of github.com:ethereum/cpp-ethereum into whizz
| -rw-r--r-- | libsolidity/SolidityEndToEndTest.cpp | 2 | ||||
| -rw-r--r-- | libsolidity/solidityExecutionFramework.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libsolidity/SolidityEndToEndTest.cpp b/libsolidity/SolidityEndToEndTest.cpp index 4a6507cd..d4454514 100644 --- a/libsolidity/SolidityEndToEndTest.cpp +++ b/libsolidity/SolidityEndToEndTest.cpp @@ -1188,7 +1188,7 @@ BOOST_AUTO_TEST_CASE(now) { char const* sourceCode = "contract test {\n" " function someInfo() returns (bool success) {\n" - " return block.timestamp() == now && now > 0;\n" + " return block.timestamp == now && now > 0;\n" " }\n" "}\n"; compileAndRun(sourceCode); diff --git a/libsolidity/solidityExecutionFramework.h b/libsolidity/solidityExecutionFramework.h index f4dbbcb9..0e863701 100644 --- a/libsolidity/solidityExecutionFramework.h +++ b/libsolidity/solidityExecutionFramework.h @@ -41,7 +41,11 @@ namespace test class ExecutionFramework { public: - ExecutionFramework() { g_logVerbosity = 0; } + ExecutionFramework() + { + g_logVerbosity = 0; + m_state.resetCurrent(); + } bytes const& compileAndRunWithoutCheck( std::string const& _sourceCode, |