From d64be90497bd9cb519d7146f49e6861fee060383 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 18 Sep 2018 16:16:21 +0100
Subject: Add PathGasMeter.estimateMax helper

---
 libsolidity/interface/GasEstimator.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'libsolidity/interface/GasEstimator.cpp')

diff --git a/libsolidity/interface/GasEstimator.cpp b/libsolidity/interface/GasEstimator.cpp
index a532f86e..e70e23a2 100644
--- a/libsolidity/interface/GasEstimator.cpp
+++ b/libsolidity/interface/GasEstimator.cpp
@@ -160,8 +160,7 @@ GasEstimator::GasConsumption GasEstimator::functionalEstimation(
 		);
 	}
 
-	PathGasMeter meter(_items, m_evmVersion);
-	return meter.estimateMax(0, state);
+	return PathGasMeter::estimateMax(_items, m_evmVersion, 0, state);
 }
 
 GasEstimator::GasConsumption GasEstimator::functionalEstimation(
@@ -183,7 +182,7 @@ GasEstimator::GasConsumption GasEstimator::functionalEstimation(
 	if (parametersSize > 0)
 		state->feedItem(swapInstruction(parametersSize));
 
-	return PathGasMeter(_items, m_evmVersion).estimateMax(_offset, state);
+	return PathGasMeter::estimateMax(_items, m_evmVersion, _offset, state);
 }
 
 set<ASTNode const*> GasEstimator::finestNodesAtLocation(
-- 
cgit v1.2.3


From e78b95d9d4ecb6d8d56ca0f04a6f9b4f7d974fbb Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 18 Oct 2018 13:35:20 +0200
Subject: Renamed SHA3.{h,cpp} files.

---
 libsolidity/interface/GasEstimator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libsolidity/interface/GasEstimator.cpp')

diff --git a/libsolidity/interface/GasEstimator.cpp b/libsolidity/interface/GasEstimator.cpp
index e70e23a2..1f20366e 100644
--- a/libsolidity/interface/GasEstimator.cpp
+++ b/libsolidity/interface/GasEstimator.cpp
@@ -24,7 +24,7 @@
 #include <map>
 #include <functional>
 #include <memory>
-#include <libdevcore/SHA3.h>
+#include <libdevcore/Keccak256.h>
 #include <libevmasm/ControlFlowGraph.h>
 #include <libevmasm/KnownState.h>
 #include <libevmasm/PathGasMeter.h>
-- 
cgit v1.2.3