reduce compiler warnings

vulcanize · Jun 12, 2023 · 8700d8b · 8700d8b
1 parent 0128c82
commit 8700d8b
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 21 deletions.
diff --git a/nimbus/evm/async/data_sources/json_rpc_data_source.nim b/nimbus/evm/async/data_sources/json_rpc_data_source.nim
@@ -28,8 +28,6 @@ from web3/ethtypes import Quantity
 #from ../../../premix/downloader import request
 #from ../../../premix/parser import prefixHex, parseBlockHeader, parseReceipt, parseTransaction
 
-from eth/common import BlockHeader
-
 # Trying to do things the new web3 way:
 from ../../../nimbus_verified_proxy/validate_proof import getAccountFromProof
 
@@ -43,7 +41,7 @@ var fetchCounter*: int
 func toHash*(s: string): Hash256 {.raises: [ValueError].} =
   hexToPaddedByteArray[32](s).toHash
 
-func toHash*(h: BlockHash): Hash256 {.raises: [ValueError].} =
+func toHash*(h: BlockHash): Hash256 {.raises: [].} =
   distinctBase(h).toHash
 
 func toWeb3BlockHash*(h: Hash256): BlockHash =

diff --git a/nimbus/rpc/rpc_utils.nim b/nimbus/rpc/rpc_utils.nim
@@ -7,7 +7,7 @@
 # This file may not be copied, modified, or distributed except according to
 # those terms.
 
-import hexstrings, eth/[common, rlp, keys, trie/db], stew/byteutils,
+import hexstrings, eth/[common, keys, trie/db], stew/byteutils,
   ../db/db_chain, strutils, algorithm, options, times, json,
   ../constants, stint, rpc_types,
   ../utils/utils, ../transaction,

diff --git a/nimbus/sync/protocol/eth67.nim b/nimbus/sync/protocol/eth67.nim
@@ -18,7 +18,6 @@ import
   chronicles,
   chronos,
   eth/[common, p2p, p2p/private/p2p_types],
-  stew/byteutils,
   ./trace_config,
   ./eth/eth_types,
   ../types,

diff --git a/stateless/tree_from_witness.nim b/stateless/tree_from_witness.nim
@@ -194,7 +194,7 @@ proc hashNode(t: var TreeBuilder, depth: int, storageMode: bool): NodeKey
 proc treeNode(t: var TreeBuilder, depth: int = 0, storageMode = false): NodeKey
 
 proc buildTree*(t: var TreeBuilder): KeccakHash
-    {.raises: [ContractCodeError, IOError, ParsingError, Exception].} =
+    {.raises: [ParsingError, Exception].} =
   let version = t.safeReadByte().int
   if version != BlockWitnessVersion.int:
     raise newException(ParsingError, "Wrong block witness version")
@@ -216,7 +216,7 @@ proc buildTree*(t: var TreeBuilder): KeccakHash
 # chunks, modify this buildForest into chunked witness tree builder
 proc buildForest*(
     t: var TreeBuilder): seq[KeccakHash]
-    {.raises: [ContractCodeError, IOError, ParsingError, Exception].} =
+    {.raises: [ParsingError, Exception].} =
   let version = t.safeReadByte().int
   if version != BlockWitnessVersion.int:
     raise newException(ParsingError, "Wrong block witness version")

diff --git a/tests/rpcclient/eth_api.nim b/tests/rpcclient/eth_api.nim
@@ -1,6 +1,6 @@
 import
   strutils,
-  json_serialization/std/[sets, net], serialization/errors,
+  json_serialization/std/[sets, net],
   json_rpc/[client, jsonmarshal],
   web3/conversions,
   eth/common,

diff --git a/tests/test_blockchain_json.nim b/tests/test_blockchain_json.nim
@@ -9,7 +9,7 @@
 # according to those terms.
 
 import
-  std/[json, os, tables, strutils, options, times],
+  std/[json, os, tables, strutils, options],
   unittest2,
   eth/rlp, eth/trie/trie_defs, eth/common/eth_types_rlp,
   stew/byteutils,
@@ -224,7 +224,7 @@ proc importBlock(tester: var Tester, com: CommonRef,
 
 proc applyFixtureBlockToChain(tester: var Tester, tb: var TestBlock,
                               com: CommonRef, checkSeal, validation: bool) =
-  decompose(tb.blockRLP, tb.header, tb.body)  
+  decompose(tb.blockRLP, tb.header, tb.body)
   tester.importBlock(com, tb, checkSeal, validation)
 
 func shouldCheckSeal(tester: Tester): bool =
@@ -268,8 +268,8 @@ proc runTester(tester: var Tester, com: CommonRef, testStatusIMPL: var TestStatu
             debugEcho "error message: ", res.error
             debugEcho "consensusType: ", com.consensus
 
-      except:
-        debugEcho "FATAL ERROR(WE HAVE BUG): ", getCurrentExceptionMsg()
+      except CatchableError as ex:
+        debugEcho "FATAL ERROR(WE HAVE BUG): ", ex.msg
 
     else:
       var noError = true

diff --git a/tests/test_generalstate_json.nim b/tests/test_generalstate_json.nim
@@ -6,7 +6,7 @@
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
 import
-  std/[strutils, tables, json, os, sets, options, times],
+  std/[strutils, tables, json, os, sets, options],
   ./test_helpers, ./test_allowed_to_fail,
   ../nimbus/core/executor, test_config,
   ../nimbus/transaction,

diff --git a/tests/test_graphql.nim b/tests/test_graphql.nim
@@ -9,7 +9,7 @@
 
 import
   std/[os, json],
-  stew/byteutils, unittest2,
+  stew/byteutils,
   eth/[p2p, rlp],
   graphql, ../nimbus/graphql/ethapi, graphql/test_common,
   ../nimbus/sync/protocol,

diff --git a/tests/test_rpc.nim b/tests/test_rpc.nim
@@ -97,7 +97,7 @@ proc setupEnv(com: CommonRef, signer, ks2: EthAddress, ctx: EthContext): TestEnv
 
   let
     receiptRoot = com.db.persistReceipts(vmState.receipts)
-    date        = initDateTime(30, mMar, 2017, 00, 00, 00, 00, utc())
+    date        = dateTime(2017, mMar, 30)
     timeStamp   = date.toTime
     difficulty  = com.calcDifficulty(timeStamp, parent)
 

diff --git a/tests/test_state_db.nim b/tests/test_state_db.nim
@@ -5,8 +5,10 @@
 #  * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-import  unittest2, eth/trie/[hexary, db],
-        ../nimbus/db/state_db, stew/[byteutils, endians2], eth/common
+import
+  unittest2,
+  ../nimbus/db/state_db,
+  stew/[byteutils, endians2]
 
 include ../nimbus/db/accounts_cache
 

diff --git a/tests/test_txpool/helpers.nim b/tests/test_txpool/helpers.nim
@@ -131,7 +131,7 @@ proc pp*(tx: Transaction): string =
     result &= ",gasLimit=" & tx.gasLimit.toKMG
   if tx.to.isSome:
     result &= ",to=" & tx.to.get.toXX
-  if tx.value != 0:
+  if tx.value.isZero.not:
     result &= ",value=" & tx.value.toKMG
   if 0 < tx.payload.len:
     result &= ",payload=" & tx.payload.toXX

diff --git a/vendor/nim-chronos b/vendor/nim-chronos
diff --git a/vendor/nim-web3 b/vendor/nim-web3
diff --git a/vendor/nimbus-eth2 b/vendor/nimbus-eth2
+4 −4		chronos/apps/http/httpbodyrw.nim
+20 −20		chronos/apps/http/httpclient.nim
+4 −4		chronos/apps/http/httpcommon.nim
+21 −21		chronos/apps/http/httpserver.nim
+1 −4		chronos/apps/http/httptable.nim
+15 −15		chronos/apps/http/multipart.nim
+1 −1		chronos/apps/http/shttpserver.nim
+76 −163		chronos/asyncfutures2.nim
+39 −46		chronos/asyncloop.nim
+12 −17		chronos/asyncmacro2.nim
+2 −6		chronos/asyncproc.nim
+25 −28		chronos/asyncsync.nim
+4 −0		chronos/config.nim
+2 −5		chronos/debugutils.nim
+221 −0		chronos/futures.nim
+4 −7		chronos/handles.nim
+13 −16		chronos/ioselects/ioselectors_epoll.nim
+15 −14		chronos/ioselects/ioselectors_kqueue.nim
+12 −15		chronos/ioselects/ioselectors_poll.nim
+1 −1		chronos/osdefs.nim
+1 −4		chronos/osutils.nim
+1 −1		chronos/ratelimit.nim
+1 −4		chronos/sendfile.nim
+3 −4		chronos/srcloc.nim
+10 −13		chronos/streams/asyncstream.nim
+1 −4		chronos/timer.nim
+16 −19		chronos/transports/common.nim
+15 −18		chronos/transports/datagram.nim
+3 −6		chronos/transports/ipnet.nim
+7 −10		chronos/transports/osnet.nim
+17 −20		chronos/transports/stream.nim
+1 −1		tests/testall.nim
+1 −1		tests/testbugs.nim
+26 −0		tests/testfutures.nim
+2 −2		tests/testsoon.nim
+3 −2		web3/engine_api.nim
+1 −1		web3/engine_api_callsigs.nim
+2 −0		web3/ethtypes.nim