cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Further framework fix.

Browse Source
This commit is contained in:
Christian 2014-11-05 18:49:58 +01:00
parent 849ccb4159
commit 693bc90275
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
solidityEndToEndTest.cpp
View File

@ -39,14 +39,12 @@ namespace test
class ExecutionFramework class ExecutionFramework
{ {
public: public:
ExecutionFramework(): m_executive(m_state) { g_logVerbosity = 0; } ExecutionFramework() { g_logVerbosity = 0; }
bytes compileAndRun(std::string const& _sourceCode) bytes compileAndRun(std::string const& _sourceCode)
{ {
bytes code = dev::solidity::CompilerStack::compile(_sourceCode); bytes code = dev::solidity::CompilerStack::compile(_sourceCode);
sendMessage(code, true); sendMessage(code, true);
m_contractAddress = m_executive.newAddress();
BOOST_REQUIRE(m_state.addressHasCode(m_contractAddress));
return m_output; return m_output;
} }
@ -65,27 +63,31 @@ public:
private: private:
void sendMessage(bytes const& _data, bool _isCreation) void sendMessage(bytes const& _data, bool _isCreation)
{ {
eth::Executive executive(m_state);
eth::Transaction t = _isCreation ? eth::Transaction(0, m_gasPrice, m_gas, _data) eth::Transaction t = _isCreation ? eth::Transaction(0, m_gasPrice, m_gas, _data)
: eth::Transaction(0, m_gasPrice, m_gas, m_contractAddress, _data); : eth::Transaction(0, m_gasPrice, m_gas, m_contractAddress, _data);
bytes transactionRLP = t.rlp(); bytes transactionRLP = t.rlp();
try try
{ {
// this will throw since the transaction is invalid, but it should nevertheless store the transaction // this will throw since the transaction is invalid, but it should nevertheless store the transaction
m_executive.setup(&transactionRLP); executive.setup(&transactionRLP);
} }
catch (...) {} catch (...) {}
if (_isCreation) if (_isCreation)
BOOST_REQUIRE(!m_executive.create(Address(), 0, m_gasPrice, m_gas, &_data, Address())); {
BOOST_REQUIRE(!executive.create(Address(), 0, m_gasPrice, m_gas, &_data, Address()));
m_contractAddress = executive.newAddress();
BOOST_REQUIRE(m_state.addressHasCode(m_contractAddress));
}
else else
BOOST_REQUIRE(!m_executive.call(m_contractAddress, Address(), 0, m_gasPrice, &_data, m_gas, Address())); BOOST_REQUIRE(!executive.call(m_contractAddress, Address(), 0, m_gasPrice, &_data, m_gas, Address()));
BOOST_REQUIRE(m_executive.go()); BOOST_REQUIRE(executive.go());
m_executive.finalize(); executive.finalize();
m_output = m_executive.out().toBytes(); m_output = executive.out().toBytes();
} }
Address m_contractAddress; Address m_contractAddress;
eth::State m_state; eth::State m_state;
eth::Executive m_executive;
u256 const m_gasPrice = 100 * eth::szabo; u256 const m_gasPrice = 100 * eth::szabo;
u256 const m_gas = 1000000; u256 const m_gas = 1000000;
bytes m_output; bytes m_output;