diff --git a/libethereum/Client.cpp b/libethereum/Client.cpp index 1e01a3a8c..f410e6eca 100644 --- a/libethereum/Client.cpp +++ b/libethereum/Client.cpp @@ -423,7 +423,7 @@ ExecutionResult Client::call(Address _dest, bytes const& _data, u256 _gas, u256 temp = m_postMine; temp.addBalance(_from, _value + _gasPrice * _gas); Executive e(temp, LastHashes(), 0); - e.collectResult(ret); + e.setResultRecipient(ret); if (!e.call(_dest, _from, _value, _gasPrice, &_data, _gas)) e.go(); e.finalize(); diff --git a/libethereum/Executive.h b/libethereum/Executive.h index 400c04298..beeee3331 100644 --- a/libethereum/Executive.h +++ b/libethereum/Executive.h @@ -119,7 +119,7 @@ public: bool excepted() const { return m_excepted != TransactionException::None; } /// Collect execution results in the result storage provided. - void collectResult(ExecutionResult& _res) { m_res = &_res; } + void setResultRecipient(ExecutionResult& _res) { m_res = &_res; } private: State& m_s; ///< The state to which this operation/transaction is applied. diff --git a/libethereum/State.cpp b/libethereum/State.cpp index 5d88405ac..20f080fdc 100644 --- a/libethereum/State.cpp +++ b/libethereum/State.cpp @@ -1190,7 +1190,7 @@ ExecutionResult State::execute(LastHashes const& _lh, Transaction const& _t, Per // transaction is bad in any way. Executive e(*this, _lh, 0); ExecutionResult res; - e.collectResult(res); + e.setResultRecipient(res); e.initialize(_t); // Uncommitting is a non-trivial operation - only do it once we've verified as much of the diff --git a/mix/MixClient.cpp b/mix/MixClient.cpp index 32875f572..7c0498ef0 100644 --- a/mix/MixClient.cpp +++ b/mix/MixClient.cpp @@ -132,7 +132,7 @@ void MixClient::executeTransaction(Transaction const& _t, State& _state, bool _c execState.addBalance(t.sender(), t.gas() * t.gasPrice()); //give it enough balance for gas estimation eth::ExecutionResult er; Executive execution(execState, lastHashes, 0); - execution.collectResult(er); + execution.setResultRecipient(er); execution.initialize(t); execution.execute(); std::vector machineStates; diff --git a/test/libsolidity/solidityExecutionFramework.h b/test/libsolidity/solidityExecutionFramework.h index 133b23604..a36e0b4ed 100644 --- a/test/libsolidity/solidityExecutionFramework.h +++ b/test/libsolidity/solidityExecutionFramework.h @@ -149,7 +149,7 @@ protected: m_state.addBalance(m_sender, _value); // just in case eth::Executive executive(m_state, eth::LastHashes(), 0); eth::ExecutionResult res; - executive.collectResult(res); + executive.setResultRecipient(res); eth::Transaction t = _isCreation ? eth::Transaction(_value, m_gasPrice, m_gas, _data, 0, KeyPair::create().sec()) :