enable styleCheck:usages (#49)

Author: arnetheduck

tests/test.nim

@@ -42,8 +42,8 @@ contract NumberStorage {
 }
 ]#
 contract(NumberStorage):
-  proc setNumber(number: Uint256)
-  proc getNumber(): Uint256 {.view.}
+  proc setNumber(number: UInt256)
+  proc getNumber(): UInt256 {.view.}
 
 const NumberStorageCode = "6060604052341561000f57600080fd5b60bb8061001d6000396000f30060606040526004361060485763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fb5c1cb8114604d578063f2c9ecd8146062575b600080fd5b3415605757600080fd5b60606004356084565b005b3415606c57600080fd5b60726089565b60405190815260200160405180910390f35b600055565b600054905600a165627a7a7230582023e722f35009f12d5698a4ab22fb9d55a6c0f479fc43875c65be46fbdd8db4310029"
 
@@ -73,9 +73,9 @@ contract MetaCoin {
 }
 ]#
 contract(MetaCoin):
-  proc sendCoin(receiver: Address, amount: Uint256): Bool
-  proc getBalance(address: Address): Uint256 {.view.}
-  proc Transfer(fromAddr, toAddr: indexed[Address], value: Uint256) {.event.}
+  proc sendCoin(receiver: Address, amount: UInt256): Bool
+  proc getBalance(address: Address): UInt256 {.view.}
+  proc Transfer(fromAddr, toAddr: indexed[Address], value: UInt256) {.event.}
   proc BlaBla(fromAddr: indexed[Address]) {.event.}
 
 const MetaCoinCode = "608060405234801561001057600080fd5b5032600090815260208190526040902061271090556101c2806100346000396000f30060806040526004361061004b5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166390b98a118114610050578063f8b2cb4f14610095575b600080fd5b34801561005c57600080fd5b5061008173ffffffffffffffffffffffffffffffffffffffff600435166024356100d5565b604080519115158252519081900360200190f35b3480156100a157600080fd5b506100c373ffffffffffffffffffffffffffffffffffffffff6004351661016e565b60408051918252519081900360200190f35b336000908152602081905260408120548211156100f457506000610168565b336000818152602081815260408083208054879003905573ffffffffffffffffffffffffffffffffffffffff871680845292819020805487019055805186815290519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a35060015b92915050565b73ffffffffffffffffffffffffffffffffffffffff16600090815260208190526040902054905600a165627a7a72305820000313ec0ebbff4ffefbe79d615d0ab019d8566100c40eb95a4eee617a87d1090029"
@@ -149,7 +149,7 @@ suite "Contracts":
       var notificationsReceived = 0
 
       let s = await ns.subscribe(Transfer) do (
-          fromAddr, toAddr: Address, value: Uint256)
+          fromAddr, toAddr: Address, value: UInt256)
           {.raises: [Defect], gcsafe.}:
         try:
           echo "onTransfer: ", fromAddr, " transferred ", value, " to ", toAddr

tests/test_logs.nim

@@ -21,8 +21,8 @@ contract LoggerContract {
 }
 ]#
 contract(LoggerContract):
-  proc MyEvent(sender: Address, number: Uint256) {.event.}
-  proc invoke(value: Uint256)
+  proc MyEvent(sender: Address, number: UInt256) {.event.}
+  proc invoke(value: UInt256)
 
 const LoggerContractCode = "6080604052348015600f57600080fd5b5060bc8061001e6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c80632b30d2b814602d575b600080fd5b604760048036036020811015604157600080fd5b50356049565b005b604080513381526020810183905281517fdf50c7bb3b25f812aedef81bc334454040e7b27e27de95a79451d663013b7e17929181900390910190a15056fea265627a7a723058202ed7f5086297d2a49fbe359f4e489a007b69eb5077f5c76328bffdb63f164b4b64736f6c63430005090032"
 
@@ -67,7 +67,7 @@ suite "Logs":
         var notificationsReceived = 0
 
         let s = await ns.subscribe(MyEvent, %*{"fromBlock": "0x0"}) do (
-            sender: Address, value: Uint256)
+            sender: Address, value: UInt256)
             {.raises: [Defect], gcsafe.}:
           try:
             echo "onEvent: ", sender, " value ", value

tests/test_signed_tx.nim

@@ -19,8 +19,8 @@ contract NumberStorage {
 }
 ]#
 contract(NumberStorage):
-  proc setNumber(number: Uint256)
-  proc getNumber(): Uint256 {.view.}
+  proc setNumber(number: UInt256)
+  proc getNumber(): UInt256 {.view.}
 
 const NumberStorageCode = "6060604052341561000f57600080fd5b60bb8061001d6000396000f30060606040526004361060485763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fb5c1cb8114604d578063f2c9ecd8146062575b600080fd5b3415605757600080fd5b60606004356084565b005b3415606c57600080fd5b60726089565b60405190815260200160405180910390f35b600055565b600054905600a165627a7a7230582023e722f35009f12d5698a4ab22fb9d55a6c0f479fc43875c65be46fbdd8db4310029"
 

web3.nim

@@ -49,7 +49,7 @@ type
     web3: Web3
     data: string
     to: Address
-    value: Uint256
+    value: UInt256
 
   ContractCall*[T] = ref object of ContractCallBase
 
@@ -405,7 +405,7 @@ macro contract*(cname: untyped, body: untyped): untyped =
         `encoder`
         return initContractCall[`output`](
             `senderName`.web3,
-            ($keccak_256.digest(`signature`))[0..<8].toLower & `encodedParams`,
+            ($keccak256.digest(`signature`))[0..<8].toLower & `encodedParams`,
             `senderName`.contractAddress)
 
       result.add procDef
@@ -681,4 +681,4 @@ proc subscribe*(s: Sender, t: typedesc, cb: proc): Future[Subscription] {.inline
   subscribe(s, t, newJObject(), cb, SubscriptionErrorHandler nil)
 
 proc `$`*(b: Bool): string =
-  $(Stint[256](b))
+  $(StInt[256](b))

web3.nimble

@@ -6,7 +6,7 @@ description   = "This is the humble begginings of library similar to web3.[js|py
 license       = "MIT or Apache License 2.0"
 
 ### Dependencies
-requires "nim >= 0.18.0"
+requires "nim >= 1.2.0"
 requires "chronicles"
 requires "chronos"
 requires "eth"
@@ -22,7 +22,11 @@ proc test(args, path: string) =
   if not dirExists "build":
     mkDir "build"
   exec "nim " & getEnv("TEST_LANG", "c") & " " & getEnv("NIMFLAGS") & " " & args &
-    " --outdir:build -r --hints:off --warnings:off --skipParentCfg " & path
+    " --outdir:build -r --skipParentCfg" &
+    " --warning[ObservableStores]:off --warning[GcUnsafe2]:off" &
+    " --styleCheck:usages --styleCheck:hint" &
+    " --hint[XDeclaredButNotUsed]:off --hint[Processing]:off " &
+    path
 
 
 ### tasks

web3/conversions.nim

@@ -27,7 +27,7 @@ proc fromJson*(n: JsonNode, argName: string, result: var ref UInt256) =
   new result
   result[] = hexStr.parse(StUint[256], 16) # TODO: Handle errors
 
-proc bytesFromJson(n: JsonNode, argName: string, result: var openarray[byte]) =
+proc bytesFromJson(n: JsonNode, argName: string, result: var openArray[byte]) =
   n.kind.expect(JString, argName)
   let hexStr = n.getStr()
   if hexStr.len != result.len * 2 + 2: # including "0x"
@@ -98,7 +98,7 @@ proc `%`*(v: Address): JsonNode =
 proc `%`*(v: TypedTransaction): JsonNode =
   result = %("0x" & distinctBase(v).toHex)
 
-proc writeHexValue(w: JsonWriter, v: openarray[byte]) =
+proc writeHexValue(w: JsonWriter, v: openArray[byte]) =
   w.stream.write "\"0x"
   w.stream.writeHex v
   w.stream.write "\""
@@ -140,7 +140,7 @@ proc `$`*(v: DynamicBytes): string {.inline.} =
   "0x" & toHex(v)
 
 proc `%`*(x: EthSend): JsonNode =
-  result = newJobject()
+  result = newJObject()
   result["from"] = %x.source
   if x.to.isSome:
     result["to"] = %x.to.unsafeGet
@@ -156,7 +156,7 @@ proc `%`*(x: EthSend): JsonNode =
     result["nonce"] = %x.nonce.unsafeGet
 
 proc `%`*(x: EthCall): JsonNode =
-  result = newJobject()
+  result = newJObject()
   result["to"] = %x.to
   if x.source.isSome:
     result["source"] = %x.source.unsafeGet
@@ -173,7 +173,7 @@ proc `%`*(x: byte): JsonNode =
   %x.int
 
 proc `%`*(x: FilterOptions): JsonNode =
-  result = newJobject()
+  result = newJObject()
   if x.fromBlock.isSome:
     result["fromBlock"] = %x.fromBlock.unsafeGet
   if x.toBlock.isSome:

web3/encoding.nim

@@ -7,13 +7,13 @@ import
 type
   EncodeResult* = tuple[dynamic: bool, data: string]
 
-func encode*[bits: static[int]](x: Stuint[bits]): EncodeResult =
-  ## Encodes a `Stuint` to a textual representation for use in the JsonRPC
+func encode*[bits: static[int]](x: StUint[bits]): EncodeResult =
+  ## Encodes a `StUint` to a textual representation for use in the JsonRPC
   ## `sendTransaction` call.
   (dynamic: false, data: '0'.repeat((256 - bits) div 4) & x.dumpHex)
 
-func encode*[bits: static[int]](x: Stint[bits]): EncodeResult =
-  ## Encodes a `Stint` to a textual representation for use in the JsonRPC
+func encode*[bits: static[int]](x: StInt[bits]): EncodeResult =
+  ## Encodes a `StInt` to a textual representation for use in the JsonRPC
   ## `sendTransaction` call.
   (dynamic: false,
   data:
@@ -23,25 +23,25 @@ func encode*[bits: static[int]](x: Stint[bits]): EncodeResult =
       '0'.repeat((256 - bits) div 4) & x.dumpHex
   )
 
-func decode*(input: string, offset: int, to: var Stuint): int =
+func decode*(input: string, offset: int, to: var StUint): int =
   let meaningfulLen = to.bits div 8 * 2
   to = type(to).fromHex(input[offset .. offset + meaningfulLen - 1])
   meaningfulLen
 
-func decode*[N](input: string, offset: int, to: var Stint[N]): int =
+func decode*[N](input: string, offset: int, to: var StInt[N]): int =
   let meaningfulLen = N div 8 * 2
   fromHex(input[offset .. offset + meaningfulLen], to)
   meaningfulLen
 
-func fixedEncode(a: openarray[byte]): EncodeResult =
+func fixedEncode(a: openArray[byte]): EncodeResult =
   var padding = a.len mod 32
   if padding != 0: padding = 32 - padding
   result = (dynamic: false, data: "00".repeat(padding) & byteutils.toHex(a))
 
 func encode*[N](b: FixedBytes[N]): EncodeResult = fixedEncode(array[N, byte](b))
 func encode*(b: Address): EncodeResult = fixedEncode(array[20, byte](b))
 
-func decodeFixed(input: string, offset: int, to: var openarray[byte]): int =
+func decodeFixed(input: string, offset: int, to: var openArray[byte]): int =
   let meaningfulLen = to.len * 2
   var padding = to.len mod 32
   if padding != 0: padding = (32 - padding) * 2
@@ -55,7 +55,7 @@ func decode*[N](input: string, offset: int, to: var FixedBytes[N]): int {.inline
 func decode*(input: string, offset: int, to: var Address): int {.inline.} =
   decodeFixed(input, offset, array[20, byte](to))
 
-func encodeDynamic(v: openarray[byte]): EncodeResult =
+func encodeDynamic(v: openArray[byte]): EncodeResult =
   result.dynamic = true
   result.data = v.len.toHex(64).toLower
   for y in v:
@@ -86,18 +86,18 @@ macro makeTypeEnum(): untyped =
       identInt = newIdentNode("Int" & $i)
     if ceil(log2(i.float)) == floor(log2(i.float)):
       lastpow2 = i
-    if i notin {256, 125}: # Int/Uint256/128 are already defined in stint. No need to repeat.
+    if i notin {256, 125}: # Int/UInt256/128 are already defined in stint. No need to repeat.
       result.add quote do:
         type
-          `identUint`* = Stuint[`lastpow2`]
-          `identInt`* = Stint[`lastpow2`]
+          `identUint`* = StUint[`lastpow2`]
+          `identInt`* = StInt[`lastpow2`]
   let
     identUint = ident("Uint")
     identInt = ident("Int")
     identBool = ident("Bool")
   result.add quote do:
     type
-      `identUint`* = Uint256
+      `identUint`* = UInt256
       `identInt`* = Int256
       `identBool`* = distinct Int256
 
@@ -139,7 +139,7 @@ macro makeTypeEnum(): untyped =
   result.add quote do:
     type
       `identFixed`* = distinct Int128
-      `identUfixed`* = distinct Uint128
+      `identUfixed`* = distinct UInt128
   for i in 1..256:
     let
       identBytes = ident("Bytes" & $i)
@@ -191,7 +191,7 @@ func encode*(x: seq[Encodable]): EncodeResult =
   result.data &= data
 
 func decode*[T](input: string, to: seq[T]): seq[T] =
-  var count = input[0..64].decode(Stuint)
+  var count = input[0..64].decode(StUint)
   result = newSeq[T](count)
   for i in 0..count:
     result[i] = input[i*64 .. (i+1)*64].decode(T)

web3/engine_api_types.nim

@@ -42,7 +42,7 @@ type
 
   # https://github.com/ethereum/execution-apis/blob/v1.0.0-alpha.8/src/engine/specification.md#transitionconfigurationv1
   TransitionConfigurationV1* = object
-    terminalTotalDifficulty*: Uint256
+    terminalTotalDifficulty*: UInt256
     terminalBlockHash*: BlockHash
     terminalBlockNumber*: Quantity
 

web3/ethtypes.nim

@@ -38,7 +38,7 @@ type
     to*: Option[Address]         # (optional when creating new contract) the address the transaction is directed to.
     gas*: Option[Quantity]            # (optional, default: 90000) integer of the gas provided for the transaction execution. It will return unused gas.
     gasPrice*: Option[int]       # (optional, default: To-Be-Determined) integer of the gasPrice used for each paid gas.
-    value*: Option[Uint256]          # (optional) integer of the value sent with this transaction.
+    value*: Option[UInt256]          # (optional) integer of the value sent with this transaction.
     data*: string                # the compiled code of a contract OR the hash of the invoked method signature and encoded parameters. For details see Ethereum Contract ABI.
     nonce*: Option[Nonce]        # (optional) integer of a nonce. This allows to overwrite your own pending transactions that use the same nonce
 
@@ -291,4 +291,4 @@ template len*(data: DynamicBytes): int =
   len(distinctBase data)
 
 func `$`*[minLen, maxLen](data: DynamicBytes[minLen, maxLen]): string =
-  "0x" & byteutils.toHex(distinctbase(data))
+  "0x" & byteutils.toHex(distinctBase(data))