Merge branch 'jangko-fix64' into devel

This commit is contained in:
Ștefan Talpalaru 2019-08-14 21:12:23 +02:00
commit d4b917d906
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
1 changed files with 1 additions and 4 deletions

View File

@ -81,10 +81,7 @@ proc testFixture(fixtures: JsonNode, testStatusIMPL: var TestStatus) =
let expectedGasRemaining = fixture{"gas"}.getHexadecimalInt let expectedGasRemaining = fixture{"gas"}.getHexadecimalInt
let actualGasRemaining = gasMeter.gasRemaining let actualGasRemaining = gasMeter.gasRemaining
checkpoint(&"Remaining: {actualGasRemaining} - Expected: {expectedGasRemaining}") checkpoint(&"Remaining: {actualGasRemaining} - Expected: {expectedGasRemaining}")
check(actualGasRemaining == expectedGasRemaining or check(actualGasRemaining == expectedGasRemaining)
computation.code.hasSStore() and
(actualGasRemaining > expectedGasRemaining and (actualGasRemaining - expectedGasRemaining) mod 15_000 == 0 or
expectedGasRemaining > actualGasRemaining and (expectedGasRemaining - actualGasRemaining) mod 15_000 == 0))
if not fixture{"post"}.isNil: if not fixture{"post"}.isNil:
verifyStateDb(fixture{"post"}, computation.vmState.readOnlyStateDB) verifyStateDb(fixture{"post"}, computation.vmState.readOnlyStateDB)