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

turn all CatchableError into error code, not only EVMError

This commit is contained in:
jangko 2021-05-05 11:06:01 +07:00
parent 0cdda3c437
commit dabff33689
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nimbus/graphql/ethapi.nim
View File

@ -140,37 +140,37 @@ proc getAccountDb(chainDB: BaseChainDB, header: BlockHeader): ReadOnlyStateDB =
proc getBlockByNumber(ctx: GraphqlContextRef, number: Node): RespResult = proc getBlockByNumber(ctx: GraphqlContextRef, number: Node): RespResult =
try: try:
ok(headerNode(ctx, getBlockHeader(ctx.chainDB, toBlockNumber(number)))) ok(headerNode(ctx, getBlockHeader(ctx.chainDB, toBlockNumber(number))))
except EVMError as e: except CatchableError as e:
err(e.msg) err(e.msg)
proc getBlockByNumber(ctx: GraphqlContextRef, number: BlockNumber): RespResult = proc getBlockByNumber(ctx: GraphqlContextRef, number: BlockNumber): RespResult =
try: try:
ok(headerNode(ctx, getBlockHeader(ctx.chainDB, number))) ok(headerNode(ctx, getBlockHeader(ctx.chainDB, number)))
except EVMError as e: except CatchableError as e:
err(e.msg) err(e.msg)
proc getBlockByHash(ctx: GraphqlContextRef, hash: Node): RespResult = proc getBlockByHash(ctx: GraphqlContextRef, hash: Node): RespResult =
try: try:
ok(headerNode(ctx, getBlockHeader(ctx.chainDB, toHash(hash)))) ok(headerNode(ctx, getBlockHeader(ctx.chainDB, toHash(hash))))
except EVMError as e: except CatchableError as e:
err(e.msg) err(e.msg)
proc getBlockByHash(ctx: GraphqlContextRef, hash: Hash256): RespResult = proc getBlockByHash(ctx: GraphqlContextRef, hash: Hash256): RespResult =
try: try:
ok(headerNode(ctx, getBlockHeader(ctx.chainDB, hash))) ok(headerNode(ctx, getBlockHeader(ctx.chainDB, hash)))
except EVMError as e: except CatchableError as e:
err(e.msg) err(e.msg)
proc getLatestBlock(ctx: GraphqlContextRef): RespResult = proc getLatestBlock(ctx: GraphqlContextRef): RespResult =
try: try:
ok(headerNode(ctx, getCanonicalHead(ctx.chainDB))) ok(headerNode(ctx, getCanonicalHead(ctx.chainDB)))
except EVMError as e: except CatchableError as e:
err("can't get latest block: " & e.msg) err("can't get latest block: " & e.msg)
proc getTxCount(ctx: GraphqlContextRef, txRoot: Hash256): RespResult = proc getTxCount(ctx: GraphqlContextRef, txRoot: Hash256): RespResult =
try: try:
ok(resp(getTransactionCount(ctx.chainDB, txRoot))) ok(resp(getTransactionCount(ctx.chainDB, txRoot)))
except EVMError as e: except CatchableError as e:
err("can't get txcount: " & e.msg) err("can't get txcount: " & e.msg)
except Exception as em: except Exception as em:
err("can't get txcount: " & em.msg) err("can't get txcount: " & em.msg)
@ -220,13 +220,13 @@ proc resp(data: openArray[byte]): RespResult =
proc getTotalDifficulty(ctx: GraphqlContextRef, blockHash: Hash256): RespResult = proc getTotalDifficulty(ctx: GraphqlContextRef, blockHash: Hash256): RespResult =
try: try:
bigIntNode(getScore(ctx.chainDB, blockHash)) bigIntNode(getScore(ctx.chainDB, blockHash))
except EVMError as e: except CatchableError as e:
err("can't get total difficulty: " & e.msg) err("can't get total difficulty: " & e.msg)
proc getOmmerCount(ctx: GraphqlContextRef, ommersHash: Hash256): RespResult = proc getOmmerCount(ctx: GraphqlContextRef, ommersHash: Hash256): RespResult =
try: try:
ok(resp(getUnclesCount(ctx.chainDB, ommersHash))) ok(resp(getUnclesCount(ctx.chainDB, ommersHash)))
except EVMError as e: except CatchableError as e:
err("can't get ommers count: " & e.msg) err("can't get ommers count: " & e.msg)
except Exception as em: except Exception as em:
err("can't get ommers count: " & em.msg) err("can't get ommers count: " & em.msg)
@ -240,7 +240,7 @@ proc getOmmers(ctx: GraphqlContextRef, ommersHash: Hash256): RespResult =
for n in uncles: for n in uncles:
list.add headerNode(ctx, n) list.add headerNode(ctx, n)
ok(list) ok(list)
except EVMError as e: except CatchableError as e:
err("can't get ommers: " & e.msg) err("can't get ommers: " & e.msg)
proc getOmmerAt(ctx: GraphqlContextRef, ommersHash: Hash256, index: int): RespResult = proc getOmmerAt(ctx: GraphqlContextRef, ommersHash: Hash256, index: int): RespResult =
@ -251,7 +251,7 @@ proc getOmmerAt(ctx: GraphqlContextRef, ommersHash: Hash256, index: int): RespRe
if index < 0 or index >= uncles.len: if index < 0 or index >= uncles.len:
return ok(respNull()) return ok(respNull())
ok(headerNode(ctx, uncles[index])) ok(headerNode(ctx, uncles[index]))
except EVMError as e: except CatchableError as e:
err("can't get ommer: " & e.msg) err("can't get ommer: " & e.msg)
proc getTxs(ctx: GraphqlContextRef, header: BlockHeader): RespResult = proc getTxs(ctx: GraphqlContextRef, header: BlockHeader): RespResult =
@ -276,7 +276,7 @@ proc getTxs(ctx: GraphqlContextRef, header: BlockHeader): RespResult =
inc index inc index
ok(list) ok(list)
except EVMError as e: except CatchableError as e:
err("can't get transactions: " & e.msg) err("can't get transactions: " & e.msg)
except Exception as em: except Exception as em:
err("can't get transactions: " & em.msg) err("can't get transactions: " & em.msg)
@ -300,7 +300,7 @@ proc getTxAt(ctx: GraphqlContextRef, header: BlockHeader, index: int): RespResul
ok(txn) ok(txn)
else: else:
ok(respNull()) ok(respNull())
except EVMError as e: except CatchableError as e:
err("can't get transaction by index '$1': $2" % [$index, e.msg]) err("can't get transaction by index '$1': $2" % [$index, e.msg])
except Exception as em: except Exception as em:
err("can't get transaction by index '$1': $2" % [$index, em.msg]) err("can't get transaction by index '$1': $2" % [$index, em.msg])
@ -310,7 +310,7 @@ proc getTxByHash(ctx: GraphqlContextRef, hash: Hash256): RespResult =
let (blockNumber, index) = getTransactionKey(ctx.chainDB, hash) let (blockNumber, index) = getTransactionKey(ctx.chainDB, hash)
let header = getBlockHeader(ctx.chainDB, blockNumber) let header = getBlockHeader(ctx.chainDB, blockNumber)
getTxAt(ctx, header, index) getTxAt(ctx, header, index)
except EVMError as e: except CatchableError as e:
err("can't get transaction by hash '$1': $2" % [hash.data.toHex, e.msg]) err("can't get transaction by hash '$1': $2" % [hash.data.toHex, e.msg])
except Exception as em: except Exception as em:
err("can't get transaction by hash '$1': $2" % [hash.data.toHex, em.msg]) err("can't get transaction by hash '$1': $2" % [hash.data.toHex, em.msg])