status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-02-03 07:45:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Alexander Ivanov 2018-02-26 13:59:56 +02:00
parent fd23b8ac0f
commit dc365b2e23
11 changed files with 59 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nimbus.nimble
View File

@ -9,7 +9,7 @@ skipDirs = @["tests"]
requires "nim >= 0.17.0",
"https://github.com/status-im/nim-keccak-tiny.git >= 0.1.0",
"https://github.com/status-im/nim-rlp.git >= 1.0.0",
"https://github.com/alehander42/nim-rlp.git#fix-ordinal",
"https://github.com/status-im/nim-ttmath >= 0.5.0"

BIN
src/constants Executable file
View File

Binary file not shown.

2
src/constants.nim
View File

@ -7,7 +7,7 @@ import
type
TypeHint* {.pure.} = enum UInt256, Bytes, Any
Bytes* = seq[byte]
#Bytes* = seq[byte]
# Int256* = BigInt #distinct int # TODO

27
src/db/state_db.nim
View File

@ -4,11 +4,11 @@ import
type
AccountStateDB* = ref object
db*: Table[string, UInt256]
db*: Table[string, Bytes]
rootHash*: string # TODO trie
proc newAccountStateDB*(db: Table[string, string], readOnly: bool = false): AccountStateDB =
result = AccountStateDB(db: initTable[string, UInt256]())
result = AccountStateDB(db: initTable[string, Bytes]())
proc logger*(db: AccountStateDB): Logger =
logging.getLogger("db.State")
@ -59,16 +59,16 @@ proc setStorage*(db: var AccountStateDB, address: string, slot: UInt256, value:
let slotAsKey = slot.intToBigEndian.pad32.toString
var storage = db.db
# TODO fix
#if value > 0:
# let encodedValue = rlp.encode(value)
# storage[slotAsKey] = encodedValue
#else:
# storage.del(slotAsKey)
storage[slotAsKey] = value
if value > 0:
let encodedValue = rlp.encode(value)
storage[slotAsKey] = encodedValue.bytes[encodedValue.ibegin..<encodedValue.iend]
else:
storage.del(slotAsKey)
#storage[slotAsKey] = value
# account.storageRoot = storage.rootHash
# db.setAccount(address, account)
proc getStorage*(db: var AccountStateDB, address: string, slot: UInt256): UInt256 =
proc getStorage*(db: var AccountStateDB, address: string, slot: UInt256): (UInt256, bool) =
validateCanonicalAddress(address, title="Storage Address")
#validateGte(slot, 0, title="Storage Slot")
@ -82,11 +82,12 @@ proc getStorage*(db: var AccountStateDB, address: string, slot: UInt256): UInt25
let slotAsKey = slot.intToBigEndian.pad32.toString
var storage = db.db
if storage.hasKey(slotAsKey):
result = storage[slotAsKey]
#let encodedValue = storage[slotAsKey]
#result = rlp.decode(encodedValue)
#result = storage[slotAsKey]
var encodedValue = storage[slotAsKey]
var r = rlpFromBytes(encodedValue.initBytesRange)
result = (r.read(Bytes).bigEndianToInt, true)
else:
result = 0.u256
result = (0.u256, false)
proc setNonce*(db: var AccountStateDB, address: string, nonce: UInt256) =
validateCanonicalAddress(address, title="Storage Address")

2
src/logging.nim
View File

@ -4,7 +4,7 @@ type
Logger* = object
name*: string
var DEBUG* = false
var DEBUG* = defined(nimbusdebug)
proc log*(l: Logger, msg: string, color: ForegroundColor = fgBlack) =
if DEBUG:

2
src/logic/comparison.nim
View File

@ -34,6 +34,6 @@ proc byteOp*(computation: var BaseComputation) =
# Bitwise And
var (position, value) = computation.stack.popInt(2)
var res = if position >= 32.u256: 0.u256 else: (value div (256.u256.pow(31'u - position.getUInt))) mod 256
var res = if position >= 32.u256: 0.u256 else: (value div (256.u256.pow(31'u64 - position.getUInt))) mod 256
pushRes()

5
src/logic/storage.nim
View File

@ -11,11 +11,12 @@ proc sstore*(computation) =
let (slot, value) = stack.popInt(2)
var currentValue = 0.u256
var existing = false
computation.vmState.db(readOnly=false):
currentValue = db.getStorage(computation.msg.storageAddress, slot)
(currentValue, existing) = db.getStorage(computation.msg.storageAddress, slot)
let isCurrentlyEmpty = currentValue == 0
let isCurrentlyEmpty = not existing
let isGoingToBeEmpty = value == 0
let gasRefund = if isCurrentlyEmpty or not isGoingToBeEmpty: 0.u256 else: REFUND_SCLEAR

2
src/utils_numeric.nim
View File

@ -1,4 +1,4 @@
import ttmath, constants, strformat, sequtils, endians, macros, utils / padding
import ttmath, constants, strformat, sequtils, endians, macros, utils / padding, rlp
# TODO improve

2
src/vm/stack.nim
View File

@ -1,5 +1,5 @@
import
strformat, strutils, sequtils, macros,
strformat, strutils, sequtils, macros, rlp,
value, ../errors, ../validation, ../utils_numeric, ../constants, ttmath, ../logging, .. / utils / bytes
type

62
tests/stack_test.nim
View File

@ -1,65 +1,73 @@
import unittest, macros, strformat, strutils, sequtils, constants, opcode_values, errors, vm / [stack, value], ttmath
import unittest, macros, strformat, strutils, sequtils, constants, opcode_values, errors, vm / [stack, value], ttmath, utils / [bytes, padding], utils_numeric
template testPush(value: untyped, expected: untyped): untyped =
var stack = newStack()
stack.push(`value`)
check(stack.values == @[`expected`])
template testFailPush(value: untyped): untyped =
var stack = newStack()
expect(ValidationError):
stack.push(`value`)
suite "stack":
test "push only valid":
for value in @[0.vint, (pow(2.i256, 256) - 1.i256).vint, "ves".vbinary]:
var stack = newStack()
stack.push(value)
check(stack.values == @[value])
for value in @[(-1).vint, (-2).vint, "yzyzyzyzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz".vbinary]:
var stack = newStack()
expect(ValidationError):
stack.push(value)
testPush(0'u, 0.u256)
testPush(UINT_256_MAX, UINT_256_MAX)
testPush("ves".toBytes, "ves".toBytes.bigEndianToInt)
testFailPush("yzyzyzyzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz".toBytes)
test "push does not allow stack to exceed 1024":
var stack = newStack()
for z in 0 .. < 1024:
stack.push(z)
stack.push(z.uint)
check(stack.len == 1024)
expect(FullStack):
stack.push(1025)
test "dup does not allow stack to exceed 1024":
var stack = newStack()
stack.push(1.i256)
stack.push(1.u256)
for z in 0 ..< 1023:
stack.dup(1.i256)
stack.dup(1)
check(stack.len == 1024)
expect(FullStack):
stack.dup(1.i256)
stack.dup(1)
test "pop returns latest stack item":
var stack = newStack()
for element in @[1.vint, 2.vint, 3.vint]:
for element in @[1'u, 2'u, 3'u]:
stack.push(element)
check(stack.popInt == 3)
check(stack.popInt == 3.u256)
stack = newStack()
for element in @["1".vbinary]:
stack.push(element)
check(stack.popBinary == "1")
stack.push("1".toBytes)
check(stack.popBinary == "1".toBytes.pad32)
test "swap correct":
var stack = newStack()
for z in 0 ..< 5:
stack.push(z)
check(stack.values == @[0.vint, 1.vint, 2.vint, 3.vint, 4.vint])
stack.push(z.uint)
check(stack.values == @[0.u256, 1.u256, 2.u256, 3.u256, 4.u256])
stack.swap(3)
check(stack.values == @[0.vint, 4.vint, 2.vint, 3.vint, 1.vint])
check(stack.values == @[0.u256, 4.u256, 2.u256, 3.u256, 1.u256])
stack.swap(1)
check(stack.values == @[0.vint, 4.vint, 2.vint, 1.vint, 3.vint])
check(stack.values == @[0.u256, 4.u256, 2.u256, 1.u256, 3.u256])
test "dup correct":
var stack = newStack()
for z in 0 ..< 5:
stack.push(z)
check(stack.values == @[0.vint, 1.vint, 2.vint, 3.vint, 4.vint])
stack.push(z.uint)
check(stack.values == @[0.u256, 1.u256, 2.u256, 3.u256, 4.u256])
stack.dup(1)
check(stack.values == @[0.vint, 1.vint, 2.vint, 3.vint, 4.vint, 4.vint])
check(stack.values == @[0.u256, 1.u256, 2.u256, 3.u256, 4.u256, 4.u256])
stack.dup(5)
check(stack.values == @[0.vint, 1.vint, 2.vint, 3.vint, 4.vint, 4.vint, 1.vint])
check(stack.values == @[0.u256, 1.u256, 2.u256, 3.u256, 4.u256, 4.u256, 1.u256])
test "pop raises InsufficientStack appropriately":
var stack = newStack()

2
tests/test_helpers.nim
View File

@ -15,7 +15,7 @@ macro jsonTest*(s: static[string], handler: untyped): untyped =
for filename in walkDirRec("tests" / "fixtures" / s):
var (folder, name) = filename.splitPath()
#if "Arithmetic" in folder: #
if name.startswith("swap"):
if name.startswith("addmodBigIntCast"):
echo name
result.add(generateTest(filename, handler))
z += 1