aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Kirchner <daniel@ekpyron.org>2018-12-12 21:58:20 +0800
committerDaniel Kirchner <daniel@ekpyron.org>2018-12-13 00:24:56 +0800
commit123d33ad41b1dea43d7b6aee4b31bc6cf373bf4a (patch)
treec051745253dbbf5e900e0081d74e65e81933d4b0
parent6d82ad13386493b80f303eb7dcda07095a62e1e8 (diff)
downloaddexon-solidity-123d33ad41b1dea43d7b6aee4b31bc6cf373bf4a.tar
dexon-solidity-123d33ad41b1dea43d7b6aee4b31bc6cf373bf4a.tar.gz
dexon-solidity-123d33ad41b1dea43d7b6aee4b31bc6cf373bf4a.tar.bz2
dexon-solidity-123d33ad41b1dea43d7b6aee4b31bc6cf373bf4a.tar.lz
dexon-solidity-123d33ad41b1dea43d7b6aee4b31bc6cf373bf4a.tar.xz
dexon-solidity-123d33ad41b1dea43d7b6aee4b31bc6cf373bf4a.tar.zst
dexon-solidity-123d33ad41b1dea43d7b6aee4b31bc6cf373bf4a.zip
Add tolerance to gas meter tests.
-rw-r--r--test/libsolidity/GasMeter.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp
index 5535bd74..12c22604 100644
--- a/test/libsolidity/GasMeter.cpp
+++ b/test/libsolidity/GasMeter.cpp
@@ -62,7 +62,7 @@ public:
);
}
- void testCreationTimeGas(string const& _sourceCode)
+ void testCreationTimeGas(string const& _sourceCode, u256 const& _tolerance = u256(0))
{
compileAndRun(_sourceCode);
auto state = make_shared<KnownState>();
@@ -75,12 +75,13 @@ public:
gas += gasForTransaction(m_compiler.object(m_compiler.lastContractName()).bytecode, true);
BOOST_REQUIRE(!gas.isInfinite);
- BOOST_CHECK_EQUAL(gas.value, m_gasUsed);
+ BOOST_CHECK_LE(m_gasUsed, gas.value);
+ BOOST_CHECK_LE(gas.value - _tolerance, m_gasUsed);
}
/// Compares the gas computed by PathGasMeter for the given signature (but unknown arguments)
/// against the actual gas usage computed by the VM on the given set of argument variants.
- void testRunTimeGas(string const& _sig, vector<bytes> _argumentVariants)
+ void testRunTimeGas(string const& _sig, vector<bytes> _argumentVariants, u256 const& _tolerance = u256(0))
{
u256 gasUsed = 0;
GasMeter::GasConsumption gas;
@@ -98,7 +99,8 @@ public:
_sig
);
BOOST_REQUIRE(!gas.isInfinite);
- BOOST_CHECK_EQUAL(gas.value, m_gasUsed);
+ BOOST_CHECK_LE(m_gasUsed, gas.value);
+ BOOST_CHECK_LE(gas.value - _tolerance, m_gasUsed);
}
static GasMeter::GasConsumption gasForTransaction(bytes const& _data, bool _isCreation)
@@ -186,7 +188,7 @@ BOOST_AUTO_TEST_CASE(updating_store)
}
}
)";
- testCreationTimeGas(sourceCode);
+ testCreationTimeGas(sourceCode, m_evmVersion < EVMVersion::constantinople() ? u256(0) : u256(9600));
}
BOOST_AUTO_TEST_CASE(branches)