From 4cf44f1b41fe021653a6f45c72c19253dd352459 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Tue, 7 Feb 2017 16:20:25 +0000 Subject: Do not use modifyTimestamp where not needed --- test/libsolidity/SolidityEndToEndTest.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'test/libsolidity') diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index 4924b55d..3c2e939c 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -1482,9 +1482,12 @@ BOOST_AUTO_TEST_CASE(now) } } )"; - m_rpc.test_modifyTimestamp(0x776347e2); compileAndRun(sourceCode); - BOOST_CHECK(callContractFunction("someInfo()") == encodeArgs(true, 0x776347e3)); + u256 startBlock = m_blockNumber; + auto ret = callContractFunction("someInfo()"); + u256 endBlock = m_blockNumber; + BOOST_CHECK(startBlock != endBlock); + BOOST_CHECK(ret == encodeArgs(true, blockTimestamp(endBlock))); } BOOST_AUTO_TEST_CASE(type_conversions_cleanup) -- cgit From a82acba49ae68a960f33a2938f3d3560bf65441c Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Fri, 10 Feb 2017 13:26:11 +0000 Subject: Compare start/end timestamp --- test/libsolidity/SolidityEndToEndTest.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'test/libsolidity') diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index 3c2e939c..53b61450 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -1484,10 +1484,13 @@ BOOST_AUTO_TEST_CASE(now) )"; compileAndRun(sourceCode); u256 startBlock = m_blockNumber; + size_t startTime = blockTimestamp(startBlock); auto ret = callContractFunction("someInfo()"); u256 endBlock = m_blockNumber; + size_t endTime = blockTimestamp(endBlock); BOOST_CHECK(startBlock != endBlock); - BOOST_CHECK(ret == encodeArgs(true, blockTimestamp(endBlock))); + BOOST_CHECK(startTime != endTime); + BOOST_CHECK(ret == encodeArgs(true, endTime)); } BOOST_AUTO_TEST_CASE(type_conversions_cleanup) -- cgit