aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGav Wood <i@gavwood.com>2015-11-20 07:06:58 +0800
committerGav Wood <i@gavwood.com>2015-11-20 07:06:58 +0800
commit58110b27c14962b6a46bc3b09e8ea1a75a4087e7 (patch)
tree87169c8c177da6eab0268692ec07371f83852c82
parent284d8f8b13e9641755179e4c74cd0ce7618d084e (diff)
parent9997aac1637727d735e1c474da6ecf9d98f072cf (diff)
downloaddexon-solidity-58110b27c14962b6a46bc3b09e8ea1a75a4087e7.tar
dexon-solidity-58110b27c14962b6a46bc3b09e8ea1a75a4087e7.tar.gz
dexon-solidity-58110b27c14962b6a46bc3b09e8ea1a75a4087e7.tar.bz2
dexon-solidity-58110b27c14962b6a46bc3b09e8ea1a75a4087e7.tar.lz
dexon-solidity-58110b27c14962b6a46bc3b09e8ea1a75a4087e7.tar.xz
dexon-solidity-58110b27c14962b6a46bc3b09e8ea1a75a4087e7.tar.zst
dexon-solidity-58110b27c14962b6a46bc3b09e8ea1a75a4087e7.zip
Merge remote-tracking branch 'origin/hot_gav' into develop
-rw-r--r--test/libsolidity/solidityExecutionFramework.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/libsolidity/solidityExecutionFramework.h b/test/libsolidity/solidityExecutionFramework.h
index 64faf7b6..a5549d5b 100644
--- a/test/libsolidity/solidityExecutionFramework.h
+++ b/test/libsolidity/solidityExecutionFramework.h
@@ -26,8 +26,10 @@
#include <tuple>
#include "../TestHelper.h"
#include <libethcore/ABI.h>
+#include <libethcore/SealEngine.h>
#include <libethereum/State.h>
#include <libethereum/Executive.h>
+#include <libethereum/ChainParams.h>
#include <libsolidity/interface/CompilerStack.h>
#include <libsolidity/interface/Exceptions.h>
@@ -43,6 +45,7 @@ class ExecutionFramework
{
public:
ExecutionFramework():
+ m_sealEngine(eth::ChainParams().createSealEngine()),
m_state(0)
{
if (g_logVerbosity != -1)
@@ -251,7 +254,7 @@ protected:
void sendMessage(bytes const& _data, bool _isCreation, u256 const& _value = 0)
{
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;
executive.setResultRecipient(res);
eth::Transaction t =
@@ -286,6 +289,7 @@ protected:
m_logs = executive.logs();
}
+ std::unique_ptr<eth::SealEngineFace> m_sealEngine;
size_t m_optimizeRuns = 200;
bool m_optimize = false;
bool m_addStandardSources = false;