diff options
| author | Gav Wood <g@ethdev.com> | 2015-11-19 19:20:46 +0800 |
|---|---|---|
| committer | Gav Wood <g@ethdev.com> | 2015-11-19 19:20:46 +0800 |
| commit | 3be0ae6e2cff95239dab9b37c9722d55481e8b26 (patch) | |
| tree | 111d1e96957b4e90619193aa4321cb60b3866f9f | |
| parent | b4e666ccf4fe39b0a1fc909b61daf6dc39e77fc4 (diff) | |
| parent | 938b6793f1a555d8e98e949c8fd2a6838f0d6c43 (diff) | |
| download | dexon-solidity-3be0ae6e2cff95239dab9b37c9722d55481e8b26.tar dexon-solidity-3be0ae6e2cff95239dab9b37c9722d55481e8b26.tar.gz dexon-solidity-3be0ae6e2cff95239dab9b37c9722d55481e8b26.tar.bz2 dexon-solidity-3be0ae6e2cff95239dab9b37c9722d55481e8b26.tar.lz dexon-solidity-3be0ae6e2cff95239dab9b37c9722d55481e8b26.tar.xz dexon-solidity-3be0ae6e2cff95239dab9b37c9722d55481e8b26.tar.zst dexon-solidity-3be0ae6e2cff95239dab9b37c9722d55481e8b26.zip | |
Merge pull request #204 from ethereum/hot_gav
The Big Refactor
| -rw-r--r-- | libsolidity/codegen/CompilerUtils.cpp | 6 | ||||
| -rw-r--r-- | test/libsolidity/SolidityEndToEndTest.cpp | 2 | ||||
| -rw-r--r-- | test/libsolidity/solidityExecutionFramework.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp index dd38ef97..6d82e94b 100644 --- a/libsolidity/codegen/CompilerUtils.cpp +++ b/libsolidity/codegen/CompilerUtils.cpp @@ -276,8 +276,10 @@ void CompilerUtils::memoryCopy() m_context << u256(0) << u256(identityContractAddress); // compute gas costs m_context << u256(32) << eth::Instruction::DUP5 << u256(31) << eth::Instruction::ADD; - m_context << eth::Instruction::DIV << u256(eth::c_identityWordGas) << eth::Instruction::MUL; - m_context << u256(eth::c_identityGas) << eth::Instruction::ADD; + static unsigned c_identityGas = 3; + static unsigned c_identityWordGas = 15; + m_context << eth::Instruction::DIV << u256(c_identityWordGas) << eth::Instruction::MUL; + m_context << u256(c_identityGas) << eth::Instruction::ADD; m_context << eth::Instruction::CALL; m_context << eth::Instruction::POP; // ignore return value } diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index 81543356..f2aa2e8e 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -1151,7 +1151,7 @@ BOOST_AUTO_TEST_CASE(blockchain) " blockNumber = block.number;\n" " }\n" "}\n"; - m_envInfo.setBeneficiary(Address(0x123)); + m_envInfo.setAuthor(Address(0x123)); m_envInfo.setNumber(7); compileAndRun(sourceCode, 27); BOOST_CHECK(callContractFunctionWithValue("someInfo()", 28) == encodeArgs(28, 0x123, 7)); diff --git a/test/libsolidity/solidityExecutionFramework.h b/test/libsolidity/solidityExecutionFramework.h index 4da02eb2..64faf7b6 100644 --- a/test/libsolidity/solidityExecutionFramework.h +++ b/test/libsolidity/solidityExecutionFramework.h @@ -42,7 +42,8 @@ namespace test class ExecutionFramework { public: - ExecutionFramework() + ExecutionFramework(): + m_state(0) { if (g_logVerbosity != -1) g_logVerbosity = 0; |