logos-storage/nim-nitro
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-nitro.git synced 2026-01-02 13:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify

Browse Source
This commit is contained in:
Mark Spanbroek 2021-04-12 18:11:40 +02:00
parent 2ac173f87c
commit 04beab5b91
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nitro/json.nim
View File

@ -54,17 +54,15 @@ func initFromJson*(bytes: var seq[byte], node: JsonNode, _: var string) =
func initFromJson*(address: var EthAddress, node: JsonNode, _: var string) =
node.expectKind(JString)
let parsed = EthAddress.parse(node.getStr)
if parsed.isSome:
address = parsed.get
if parsed =? EthAddress.parse(node.getStr):
address = parsed
else:
raise newException(ValueError, "invalid ethereum address")
func initFromJson*(dest: var Destination, node: JsonNode, _: var string) =
node.expectKind(JString)
let parsed = Destination.parse(node.getStr)
if parsed.isSome:
dest = parsed.get
if parsed =? Destination.parse(node.getStr):
dest = parsed
else:
raise newException(ValueError, "invalid nitro destination")
@ -74,9 +72,8 @@ func initFromJson*(number: var UInt256, node: JsonNode, _: var string) =
func initFromJson*(signature: var Signature, node: JsonNode, _: var string) =
node.expectKind(JString)
let parsed = Signature.parse(node.getStr)
if parsed.isSome:
signature = parsed.get
if parsed =? Signature.parse(node.getStr):
signature = parsed
else:
raise newException(ValueError, "invalid signature")