diff options
| author | Gav Wood <i@gavwood.com> | 2015-07-16 07:29:03 +0800 |
|---|---|---|
| committer | Gav Wood <i@gavwood.com> | 2015-07-17 14:46:41 +0800 |
| commit | 80c55ce87a338cbf852b8c6547fda9cbbf8af2a9 (patch) | |
| tree | efd365224ad6ec23ae02d45eddacdc87cbee2eb2 | |
| parent | 57f7839049d39f2935ea50079285621dc473b70f (diff) | |
| download | dexon-solidity-80c55ce87a338cbf852b8c6547fda9cbbf8af2a9.tar.gz dexon-solidity-80c55ce87a338cbf852b8c6547fda9cbbf8af2a9.tar.zst dexon-solidity-80c55ce87a338cbf852b8c6547fda9cbbf8af2a9.zip | |
All fields of BlockInfo now private.
| -rw-r--r-- | TestHelper.cpp | 6 | ||||
| -rw-r--r-- | libsolidity/SolidityEndToEndTest.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index b43c4db5..bae980a7 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -151,12 +151,12 @@ void ImportTest::importEnv(json_spirit::mObject& _o) assert(_o.count("currentCoinbase") > 0); assert(_o.count("currentNumber") > 0); - m_environment.currentBlock.parentHash = h256(_o["previousHash"].get_str()); + m_environment.currentBlock.parentHash() = h256(_o["previousHash"].get_str()); m_environment.currentBlock.number = toInt(_o["currentNumber"]); m_environment.currentBlock.gasLimit = toInt(_o["currentGasLimit"]); m_environment.currentBlock.difficulty = toInt(_o["currentDifficulty"]); - m_environment.currentBlock.timestamp = toInt(_o["currentTimestamp"]); - m_environment.currentBlock.coinbaseAddress = Address(_o["currentCoinbase"].get_str()); + m_environment.currentBlock.timestamp() = toInt(_o["currentTimestamp"]); + m_environment.currentBlock.coinbaseAddress() = Address(_o["currentCoinbase"].get_str()); m_statePre.m_previousBlock = m_environment.previousBlock; m_statePre.m_currentBlock = m_environment.currentBlock; diff --git a/libsolidity/SolidityEndToEndTest.cpp b/libsolidity/SolidityEndToEndTest.cpp index 9f806347..be44ea00 100644 --- a/libsolidity/SolidityEndToEndTest.cpp +++ b/libsolidity/SolidityEndToEndTest.cpp @@ -1187,7 +1187,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); |