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

work in progress in testing the new function selector in the end to end tests

Browse Source
This commit is contained in:
Lefteris Karapetsas 2015-01-08 00:19:19 +01:00
parent 38cc0b8dd3
commit 9f7e9d9cdd
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
solidityExecutionFramework.h
View File

@ -29,6 +29,7 @@
#include <libethereum/State.h> #include <libethereum/State.h>
#include <libethereum/Executive.h> #include <libethereum/Executive.h>
#include <libsolidity/CompilerStack.h> #include <libsolidity/CompilerStack.h>
#include <libsolidity/AST.h>
namespace dev namespace dev
{ {
@ -48,17 +49,32 @@ public:
bytes const& compileAndRun(std::string const& _sourceCode, u256 const& _value = 0, std::string const& _contractName = "") bytes const& compileAndRun(std::string const& _sourceCode, u256 const& _value = 0, std::string const& _contractName = "")
{ {
dev::solidity::CompilerStack compiler; /* dev::solidity::CompilerStack compiler; */
compiler.compile(_sourceCode, m_optimize); m_compiler.compile(_sourceCode, m_optimize);
bytes code = compiler.getBytecode(_contractName); bytes code = m_compiler.getBytecode(_contractName);
/* m_contractDefinition = compiler.getContractDefinition(_contractName); */
sendMessage(code, true, _value); sendMessage(code, true, _value);
BOOST_REQUIRE(!m_output.empty()); BOOST_REQUIRE(!m_output.empty());
return m_output; return m_output;
} }
bytes const& callContractFunction(byte _index, bytes const& _data = bytes(), u256 const& _value = 0) bytes const& callContractFunction(byte _index, bytes const& _data = bytes(),
u256 const& _value = 0)
{ {
sendMessage(bytes(1, _index) + _data, false, _value); /* if (!_contractDef) */
/* _contractDef = m_contractDefinition; */
unsigned index = 0;
auto interfaceFunctions = m_compiler.getContractDefinition("").getInterfaceFunctions();
for (auto it = interfaceFunctions.cbegin(); it != interfaceFunctions.cend(); ++it, ++index)
if (index == _index)
{
sendMessage(it->first.asBytes() + _data, false, _value);
/* sendMessage(bytes(1, _index) + _data, false, _value); */
return m_output;
}
BOOST_FAIL("Function with index " << _index << "not found");
return m_output; return m_output;
} }
@ -149,6 +165,9 @@ protected:
bool m_optimize = false; bool m_optimize = false;
Address m_sender; Address m_sender;
Address m_contractAddress; Address m_contractAddress;
/* ContractDefinition m_contractDefinition; */
dev::solidity::CompilerStack m_compiler;
eth::State m_state; eth::State m_state;
u256 const m_gasPrice = 100 * eth::szabo; u256 const m_gasPrice = 100 * eth::szabo;
u256 const m_gas = 1000000; u256 const m_gas = 1000000;