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

Removed utils from p2p and updated names in rpc_utils

This commit is contained in:
coffeepots 2018-11-29 17:08:13 +00:00
parent a5aad977dd
commit 8d4c00cd3f
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nimbus/rpc/p2p.nim
View File

@ -29,14 +29,6 @@ import
proc `%`*(value: Time): JsonNode = proc `%`*(value: Time): JsonNode =
result = %value.toSeconds result = %value.toSeconds
func toAddress(value: EthAddressStr): EthAddress = hexToPaddedByteArray[20](value.string)
func toHash(value: array[32, byte]): Hash256 {.inline.} =
result.data = value
func toHash(value: EthHashStr): Hash256 {.inline.} =
result = hexToPaddedByteArray[32](value.string).toHash
template balance(addressDb: AccountStateDb, address: EthAddress): GasInt = template balance(addressDb: AccountStateDb, address: EthAddress): GasInt =
# TODO: Account balance u256 but GasInt is int64? # TODO: Account balance u256 but GasInt is int64?
addressDb.getBalance(address).truncate(int64) addressDb.getBalance(address).truncate(int64)

7
nimbus/rpc/rpc_utils.nim
View File

@ -9,10 +9,11 @@
import hexstrings, nimcrypto, eth_common, byteutils import hexstrings, nimcrypto, eth_common, byteutils
func strToAddress*(value: string): EthAddress = hexToPaddedByteArray[20](value) func toAddress*(value: EthAddressStr): EthAddress = hexToPaddedByteArray[20](value.string)
func toHash*(value: array[32, byte]): Hash256 {.inline.} = func toHash*(value: array[32, byte]): Hash256 {.inline.} =
result.data = value result.data = value
func strToHash*(value: string): Hash256 {.inline.} = func toHash*(value: EthHashStr): Hash256 {.inline.} =
result = hexToPaddedByteArray[32](value).toHash result = hexToPaddedByteArray[32](value.string).toHash