From 4aa2d965dcdb7f63323f13d913d9d0a4d99a6d40 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 28 Jan 2019 15:44:41 +0000 Subject: [PATCH] Remove once-off helper in ConstantOptimiser For clarity. Makes code easier to understand. --- libevmasm/ConstantOptimiser.cpp | 2 +- libevmasm/ConstantOptimiser.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libevmasm/ConstantOptimiser.cpp b/libevmasm/ConstantOptimiser.cpp index b56415a95..76e96aa5f 100644 --- a/libevmasm/ConstantOptimiser.cpp +++ b/libevmasm/ConstantOptimiser.cpp @@ -129,7 +129,7 @@ bigint LiteralMethod::gasNeeded() const return combineGas( simpleRunGas({Instruction::PUSH1}), // PUSHX plus data - (m_params.isCreation ? GasCosts::txDataNonZeroGas : GasCosts::createDataGas) + dataGas(), + (m_params.isCreation ? GasCosts::txDataNonZeroGas : GasCosts::createDataGas) + dataGas(toCompactBigEndian(m_value, 1)), 0 ); } diff --git a/libevmasm/ConstantOptimiser.h b/libevmasm/ConstantOptimiser.h index 9108e0397..ff14a916e 100644 --- a/libevmasm/ConstantOptimiser.h +++ b/libevmasm/ConstantOptimiser.h @@ -79,8 +79,6 @@ protected: static bigint simpleRunGas(AssemblyItems const& _items); /// @returns the gas needed to store the given data literally bigint dataGas(bytes const& _data) const; - /// @returns the gas needed to store the value literally - bigint dataGas() const { return dataGas(toCompactBigEndian(m_value, 1)); } static size_t bytesRequired(AssemblyItems const& _items); /// @returns the combined estimated gas usage taking @a m_params into account. bigint combineGas(