aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libsolidity/SolidityEndToEndTest.cpp2
-rw-r--r--libsolidity/solidityExecutionFramework.h6
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,