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

remove unused eraseReturnData

This commit is contained in:
andri lim 2020-01-15 07:22:09 +07:00 committed by zah
parent 52fffa6e25
commit 009aa35dfb
4 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nimbus/errors.nim
View File

@ -23,8 +23,6 @@ type
VMError* = object of EVMError VMError* = object of EVMError
## Class of errors which can be raised during VM execution. ## Class of errors which can be raised during VM execution.
erasesReturnData*: bool
burnsGas*: bool
OutOfGas* = object of VMError OutOfGas* = object of VMError
## Error signaling that VM execution has run out of gas. ## Error signaling that VM execution has run out of gas.
@ -67,8 +65,3 @@ type
StaticContextError* = object of VMError StaticContextError* = object of VMError
## State changes not allowed in static call context ## State changes not allowed in static call context
proc makeVMError*: ref VMError =
new(result)
result.burnsGas = true
result.erasesReturnData = true

11
nimbus/vm/computation.nim
View File

@ -50,27 +50,16 @@ template isError*(c: Computation): bool =
func shouldBurnGas*(c: Computation): bool = func shouldBurnGas*(c: Computation): bool =
c.isError and c.error.burnsGas c.isError and c.error.burnsGas
func shouldEraseReturnData*(c: Computation): bool =
c.isError and c.error.erasesReturnData
func bytesToHex(x: openarray[byte]): string {.inline.} = func bytesToHex(x: openarray[byte]): string {.inline.} =
## TODO: use seq[byte] for raw data and delete this proc ## TODO: use seq[byte] for raw data and delete this proc
foldl(x, a & b.int.toHex(2).toLowerAscii, "0x") foldl(x, a & b.int.toHex(2).toLowerAscii, "0x")
func output*(c: Computation): seq[byte] = func output*(c: Computation): seq[byte] =
if c.shouldEraseReturnData:
@[]
else:
c.rawOutput c.rawOutput
func `output=`*(c: Computation, value: openarray[byte]) = func `output=`*(c: Computation, value: openarray[byte]) =
c.rawOutput = @value c.rawOutput = @value
proc outputHex*(c: Computation): string =
if c.shouldEraseReturnData:
return "0x"
c.rawOutput.bytesToHex
proc isSuicided*(c: Computation, address: EthAddress): bool = proc isSuicided*(c: Computation, address: EthAddress): bool =
result = address in c.suicides result = address in c.suicides

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

@ -777,8 +777,8 @@ template genCall(callName: untyped, opCode: Op): untyped =
else: else:
push: 1 push: 1
if not child.shouldEraseReturnData:
let actualOutputSize = min(c.memOutLen, child.output.len) let actualOutputSize = min(c.memOutLen, child.output.len)
if actualOutputSize > 0:
c.memory.write( c.memory.write(
c.memOutPos, c.memOutPos,
child.output.toOpenArray(0, actualOutputSize - 1)) child.output.toOpenArray(0, actualOutputSize - 1))

1
nimbus/vm_types.nim
View File

@ -79,7 +79,6 @@ type
Error* = ref object Error* = ref object
info*: string info*: string
burnsGas*: bool burnsGas*: bool
erasesReturnData*: bool
GasMeter* = object GasMeter* = object
gasRefunded*: GasInt gasRefunded*: GasInt