cerc-io/solidity
16
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

Merge remote-tracking branch 'origin/hot_gav' into develop

Browse Source
This commit is contained in:
Gav Wood 2015-11-20 00:06:58 +01:00
commit 58110b27c1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/libsolidity/solidityExecutionFramework.h
View File

@ -26,8 +26,10 @@
#include <tuple> #include <tuple>
#include "../TestHelper.h" #include "../TestHelper.h"
#include <libethcore/ABI.h> #include <libethcore/ABI.h>
#include <libethcore/SealEngine.h>
#include <libethereum/State.h> #include <libethereum/State.h>
#include <libethereum/Executive.h> #include <libethereum/Executive.h>
#include <libethereum/ChainParams.h>
#include <libsolidity/interface/CompilerStack.h> #include <libsolidity/interface/CompilerStack.h>
#include <libsolidity/interface/Exceptions.h> #include <libsolidity/interface/Exceptions.h>
@ -43,6 +45,7 @@ class ExecutionFramework
{ {
public: public:
ExecutionFramework(): ExecutionFramework():
m_sealEngine(eth::ChainParams().createSealEngine()),
m_state(0) m_state(0)
{ {
if (g_logVerbosity != -1) if (g_logVerbosity != -1)
@ -251,7 +254,7 @@ protected:
void sendMessage(bytes const& _data, bool _isCreation, u256 const& _value = 0) void sendMessage(bytes const& _data, bool _isCreation, u256 const& _value = 0)
{ {
m_state.addBalance(m_sender, _value); // just in case m_state.addBalance(m_sender, _value); // just in case
eth::Executive executive(m_state, m_envInfo, 0); eth::Executive executive(m_state, m_envInfo, m_sealEngine.get());
eth::ExecutionResult res; eth::ExecutionResult res;
executive.setResultRecipient(res); executive.setResultRecipient(res);
eth::Transaction t = eth::Transaction t =
@ -286,6 +289,7 @@ protected:
m_logs = executive.logs(); m_logs = executive.logs();
} }
std::unique_ptr<eth::SealEngineFace> m_sealEngine;
size_t m_optimizeRuns = 200; size_t m_optimizeRuns = 200;
bool m_optimize = false; bool m_optimize = false;
bool m_addStandardSources = false; bool m_addStandardSources = false;