Merge pull request #2134 from chfast/refactor_executive

Executive refactor

libethereum/Executive.cpp

@@ -201,12 +201,12 @@ void Executive::initialize(Transaction const& _transaction)
 
 	// Avoid unaffordable transactions.
 	m_gasCost = (bigint)m_t.gas() * m_t.gasPrice();
-	m_totalCost = m_t.value() + m_gasCost;
+	bigint totalCost = m_t.value() + m_gasCost;
-	if (m_s.balance(m_t.sender()) < m_totalCost)
+	if (m_s.balance(m_t.sender()) < totalCost)
 	{
-		clog(ExecutiveWarnChannel) << "Not enough cash: Require >" << m_totalCost << " Got" << m_s.balance(m_t.sender()) << "for sender: " << m_t.sender();
+		clog(ExecutiveWarnChannel) << "Not enough cash: Require >" << totalCost << " Got" << m_s.balance(m_t.sender()) << "for sender: " << m_t.sender();
 		m_excepted = TransactionException::NotEnoughCash;
-		BOOST_THROW_EXCEPTION(NotEnoughCash() << RequirementError(m_totalCost, (bigint)m_s.balance(m_t.sender())) << errinfo_comment(m_t.sender().abridged()));
+		BOOST_THROW_EXCEPTION(NotEnoughCash() << RequirementError(totalCost, (bigint)m_s.balance(m_t.sender())) << errinfo_comment(m_t.sender().abridged()));
 	}
 }
 

libethereum/Executive.h

@@ -86,8 +86,6 @@ public:
 	Executive(State& _s, LastHashes const& _lh, unsigned _level = 0): m_s(_s), m_lastHashes(_lh), m_depth(_level) {}
 	/// Basic constructor.
 	Executive(State& _s, BlockChain const& _bc, unsigned _level = 0);
-	/// Basic destructor.
-	~Executive() = default;
 
 	Executive(Executive const&) = delete;
 	void operator=(Executive) = delete;
@@ -145,7 +143,7 @@ public:
 private:
 	State& m_s;							///< The state to which this operation/transaction is applied.
 	LastHashes m_lastHashes;
-	std::shared_ptr<ExtVM> m_ext;		///< The VM externality object for the VM execution or null if no VM is required.
+	std::shared_ptr<ExtVM> m_ext;		///< The VM externality object for the VM execution or null if no VM is required. shared_ptr used only to allow ExtVM forward reference.
 	bytesRef m_outRef;					///< Reference to "expected output" buffer.
 	ExecutionResult* m_res = nullptr;	///< Optional storage for execution results.
 	Address m_newAddress;				///< The address of the created contract in the case of create() being called.
@@ -158,9 +156,7 @@ private:
 	Transaction m_t;					///< The original transaction. Set by setup().
 	LogEntries m_logs;					///< The log entries created by this transaction. Set by finalize().
 
-	bigint m_gasRequired;				///< Gas required during execution of the transaction.
 	bigint m_gasCost;
-	bigint m_totalCost;
 };
 
 }