status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix assorted test fixtures which have been un-skipped

This commit is contained in:
Dustin Brody 2018-08-02 15:57:28 -07:00
parent 8325b6461f
commit 71679d6d95
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
VMTests.md
View File

@ -286,10 +286,10 @@ OK: 5/5 Fail: 0/5 Skip: 0/5
+ balanceAddressInputTooBigLeftMyAddress.json OK
+ balanceAddressInputTooBigRightMyAddress.json OK
+ balanceCaller3.json OK
- calldatacopy0.json Fail
- calldatacopy0_return.json Fail
- calldatacopy1.json Fail
- calldatacopy1_return.json Fail
+ calldatacopy0.json OK
+ calldatacopy0_return.json OK
+ calldatacopy1.json OK
+ calldatacopy1_return.json OK
+ calldatacopy2.json OK
+ calldatacopy2_return.json OK
+ calldatacopyUnderFlow.json OK
@ -299,7 +299,7 @@ OK: 5/5 Fail: 0/5 Skip: 0/5
- calldatacopy_DataIndexTooHigh2.json Fail
- calldatacopy_DataIndexTooHigh2_return.json Fail
- calldatacopy_DataIndexTooHigh_return.json Fail
- calldatacopy_sec.json Fail
+ calldatacopy_sec.json OK
+ calldataload0.json OK
+ calldataload1.json OK
+ calldataload2.json OK
@ -326,7 +326,7 @@ OK: 5/5 Fail: 0/5 Skip: 0/5
+ gasprice.json OK
+ origin.json OK
```
OK: 39/51 Fail: 12/51 Skip: 0/51
OK: 44/51 Fail: 7/51 Skip: 0/51
## vmIOandFlowOperations
```diff
+ BlockNumberDynamicJump0_AfterJumpdest.json OK
@ -393,7 +393,7 @@ OK: 39/51 Fail: 12/51 Skip: 0/51
+ bad_indirect_jump1.json OK
+ bad_indirect_jump2.json OK
+ byte1.json OK
- calldatacopyMemExp.json Fail
+ calldatacopyMemExp.json OK
+ codecopyMemExp.json OK
+ deadCode_1.json OK
+ dupAt51becameMload.json OK
@ -475,7 +475,7 @@ OK: 39/51 Fail: 12/51 Skip: 0/51
+ swapAt52becameMstore.json OK
+ when.json OK
```
OK: 144/145 Fail: 1/145 Skip: 0/145
OK: 145/145 Fail: 0/145 Skip: 0/145
## vmLogTest
```diff
+ log0_emptyMem.json OK
@ -628,16 +628,16 @@ OK: 0/18 Fail: 0/18 Skip: 18/18
OK: 74/74 Fail: 0/74 Skip: 0/74
## vmRandomTest
```diff
- 201503102320PYTHON.json Fail
- 201503110206PYTHON.json Fail
- 201503110219PYTHON.json Fail
- 201503110226PYTHON_DUP6.json Fail
- 201503110346PYTHON_PUSH24.json Fail
- 201503111844PYTHON.json Fail
- 201503112218PYTHON.json Fail
- randomTest.json Fail
+ 201503102320PYTHON.json OK
+ 201503110206PYTHON.json OK
+ 201503110219PYTHON.json OK
+ 201503110226PYTHON_DUP6.json OK
+ 201503110346PYTHON_PUSH24.json OK
+ 201503111844PYTHON.json OK
+ 201503112218PYTHON.json OK
+ randomTest.json OK
```
OK: 0/8 Fail: 8/8 Skip: 0/8
OK: 8/8 Fail: 0/8 Skip: 0/8
## vmSha3Test
```diff
+ sha3_0.json OK

4
nimbus/vm/interpreter/gas_costs.nim
View File

@ -229,14 +229,14 @@ template gasCosts(FeeSchedule: GasFeeSchedule, prefix, ResultGasCostsName: untyp
func `prefix gasLog3`(currentMemSize, memOffset, memLength: Natural): GasInt {.nimcall.} =
result = `prefix gasMemoryExpansion`(currentMemSize, memOffset, memLength)
result = static(FeeSchedule[GasLog]) +
result += static(FeeSchedule[GasLog]) +
static(FeeSchedule[GasLogData]) * memLength +
static(3 * FeeSchedule[GasLogTopic])
func `prefix gasLog4`(currentMemSize, memOffset, memLength: Natural): GasInt {.nimcall.} =
result = `prefix gasMemoryExpansion`(currentMemSize, memOffset, memLength)
result = static(FeeSchedule[GasLog]) +
result += static(FeeSchedule[GasLog]) +
static(FeeSchedule[GasLogData]) * memLength +
static(4 * FeeSchedule[GasLogTopic])

4
nimbus/vm/interpreter/opcodes_impl.nim
View File

@ -281,10 +281,10 @@ op callDataCopy, inline = false, memStartPos, copyStartPos, size:
let (memPos, copyPos, len) = (memStartPos.toInt, copyStartPos.toInt, size.toInt)
computation.gasMeter.consumeGas(
computation.gasCosts[CallDataCopy].m_handler(memPos, copyPos, len),
computation.gasCosts[CallDataCopy].m_handler(computation.memory.len, memPos, len),
reason="CallDataCopy fee")
computation.memory.writePaddedResult(computation.code.bytes, memPos, copyPos, len)
computation.memory.writePaddedResult(computation.msg.data, memPos, copyPos, len)
op codesize, inline = true:
## 0x38, Get size of code running in current environment.

2
tests/test_vm_json.nim
View File

@ -37,7 +37,7 @@ proc testFixture(fixtures: JsonNode, testStatusIMPL: var TestStatus) =
var emptyRlpHash = keccak256.digest(rlp.encode("").toOpenArray)
let header = BlockHeader(
coinbase: fenv{"currentCoinbase"}.getStr.parseAddress,
difficulty: fenv{"currentDifficulty"}.getHexadecimalInt.u256,
difficulty: fromHex(UInt256, fenv{"currentDifficulty"}.getStr),
blockNumber: fenv{"currentNumber"}.getHexadecimalInt.u256,
gasLimit: fenv{"currentGasLimit"}.getHexadecimalInt.GasInt,
timestamp: fenv{"currentTimestamp"}.getHexadecimalInt.int64.fromUnix,