update code after rebase

ethereum · Nov 23, 2016 · 8c40a2c · 8c40a2c
1 parent 5dc25db
commit 8c40a2c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/libethereum/Executive.cpp b/libethereum/Executive.cpp
@@ -310,7 +310,7 @@ bool Executive::create(Address _sender, u256 _endowment, u256 _gasPrice, u256 _g
 	if (!_init.empty())
 		m_ext = make_shared<ExtVM>(m_s, m_envInfo, m_sealEngine, m_newAddress, _sender, _origin, _endowment, _gasPrice, bytesConstRef(), _init, sha3(_init), m_depth);
 
-	bool incrementNonce = m_envInfo.number() >= m_sealEngine->chainParams().u256Param("EIP158ForkBlock");
+	bool incrementNonce = m_envInfo.number() >= m_sealEngine.chainParams().u256Param("EIP158ForkBlock");
 	m_s.createContract(m_newAddress, incrementNonce);
 	m_s.transferBalance(_sender, m_newAddress, _endowment);
 

diff --git a/libethereum/State.cpp b/libethereum/State.cpp
@@ -559,7 +559,7 @@ std::pair<ExecutionResult, TransactionReceipt> State::execute(EnvInfo const& _en
 		m_cache.clear();
 	else
 	{
-		bool removeEmptyAccounts = _envInfo.number() >= _sealEngine->chainParams().u256Param("EIP158ForkBlock");
+		bool removeEmptyAccounts = _envInfo.number() >= _sealEngine.chainParams().u256Param("EIP158ForkBlock");
 		commit(removeEmptyAccounts ? State::CommitBehaviour::RemoveEmptyAccounts : State::CommitBehaviour::KeepEmptyAccounts);
 
 #if ETH_PARANOIA && !ETH_FATDB

diff --git a/test/TestHelper.cpp b/test/TestHelper.cpp
@@ -170,7 +170,7 @@ bytes ImportTest::executeTest(eth::Network _sealEngineNetwork)
 	try
 	{
 		se.reset(ChainParams(genesisInfo(_sealEngineNetwork)).createSealEngine());
-		std::pair<ExecutionResult, TransactionReceipt>  execOut = m_statePre.execute(m_envInfo, se.get(), m_transaction);
+		std::pair<ExecutionResult, TransactionReceipt>  execOut = m_statePre.execute(m_envInfo, *se.get(), m_transaction);
 		res = execOut.first;
 		m_logs = execOut.second.log();
 	}