aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
diff options
context:
space:
mode:
authorGav Wood <g@ethdev.com>2015-06-08 21:52:39 +0800
committerGav Wood <g@ethdev.com>2015-06-08 21:52:39 +0800
commit88865c546fc27f824d37e72496e9fcd3181539e9 (patch)
tree718bc690899beb0408d40c76b32d7e1a7ebbdedd /libsolidity
parent6f12765591059c936527129bb19078ec88866ffb (diff)
parent8c66813683d176ae47bf87c691a924efca8627eb (diff)
downloaddexon-solidity-88865c546fc27f824d37e72496e9fcd3181539e9.tar.gz
dexon-solidity-88865c546fc27f824d37e72496e9fcd3181539e9.tar.zst
dexon-solidity-88865c546fc27f824d37e72496e9fcd3181539e9.zip
Merge pull request #2025 from imapp-pl/refactor_executive
Executive on a diet
Diffstat (limited to 'libsolidity')
-rw-r--r--libsolidity/solidityExecutionFramework.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libsolidity/solidityExecutionFramework.h b/libsolidity/solidityExecutionFramework.h
index e81b4d7b..44590b1c 100644
--- a/libsolidity/solidityExecutionFramework.h
+++ b/libsolidity/solidityExecutionFramework.h
@@ -148,6 +148,8 @@ protected:
{
m_state.addBalance(m_sender, _value); // just in case
eth::Executive executive(m_state, eth::LastHashes(), 0);
+ eth::ExecutionResult res;
+ executive.setResultRecipient(res);
eth::Transaction t =
_isCreation ?
eth::Transaction(_value, m_gasPrice, m_gas, _data, 0, KeyPair::create().sec()) :
@@ -176,7 +178,7 @@ protected:
m_state.noteSending(m_sender);
executive.finalize();
m_gasUsed = executive.gasUsed();
- m_output = executive.out().toVector();
+ m_output = std::move(res.output); // FIXME: Looks like Framework needs ExecutiveResult embedded
m_logs = executive.logs();
}