aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-10-03 18:48:47 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-10-03 18:59:53 +0800
commit4d1c48eeee8a0b71b79ce51a811e8f1f3e2388d6 (patch)
tree1b8e3c8755354423f1176748b8d49e93232bcb85 /test
parent43719839bf02a17cea2014266abca837f88ab35e (diff)
downloaddexon-solidity-4d1c48eeee8a0b71b79ce51a811e8f1f3e2388d6.tar.gz
dexon-solidity-4d1c48eeee8a0b71b79ce51a811e8f1f3e2388d6.tar.zst
dexon-solidity-4d1c48eeee8a0b71b79ce51a811e8f1f3e2388d6.zip
Remove duplicate EVMSchedule
Diffstat (limited to 'test')
-rw-r--r--test/libsolidity/GasMeter.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp
index b759678f..c2886f5b 100644
--- a/test/libsolidity/GasMeter.cpp
+++ b/test/libsolidity/GasMeter.cpp
@@ -21,7 +21,6 @@
*/
#include <test/libsolidity/SolidityExecutionFramework.h>
-#include <libevmasm/EVMSchedule.h>
#include <libevmasm/GasMeter.h>
#include <libevmasm/KnownState.h>
#include <libevmasm/PathGasMeter.h>
@@ -63,15 +62,13 @@ public:
void testCreationTimeGas(string const& _sourceCode)
{
- EVMSchedule schedule;
-
compileAndRun(_sourceCode);
auto state = make_shared<KnownState>();
PathGasMeter meter(*m_compiler.assemblyItems());
GasMeter::GasConsumption gas = meter.estimateMax(0, state);
u256 bytecodeSize(m_compiler.runtimeObject().bytecode.size());
// costs for deployment
- gas += bytecodeSize * schedule.createDataGas;
+ gas += bytecodeSize * GasCosts::createDataGas;
// costs for transaction
gas += gasForTransaction(m_compiler.object().bytecode, true);
@@ -103,10 +100,9 @@ public:
static GasMeter::GasConsumption gasForTransaction(bytes const& _data, bool _isCreation)
{
- EVMSchedule schedule;
- GasMeter::GasConsumption gas = _isCreation ? schedule.txCreateGas : schedule.txGas;
+ GasMeter::GasConsumption gas = _isCreation ? GasCosts::txCreateGas : GasCosts::txGas;
for (auto i: _data)
- gas += i != 0 ? schedule.txDataNonZeroGas : schedule.txDataZeroGas;
+ gas += i != 0 ? GasCosts::txDataNonZeroGas : GasCosts::txDataZeroGas;
return gas;
}