diff --git a/eth/keyfile/keyfile.nim b/eth/keyfile/keyfile.nim index a179f63..72270f3 100644 --- a/eth/keyfile/keyfile.nim +++ b/eth/keyfile/keyfile.nim @@ -10,9 +10,9 @@ {.push raises: [Defect].} import nimcrypto/[bcmode, hmac, rijndael, pbkdf2, sha2, sysrand, utils, keccak], - eth/keys, json, uuid, strutils, stew/result + eth/keys, json, uuid, strutils, stew/results -export result +export results const # Version 3 constants diff --git a/eth/keyfile/uuid.nim b/eth/keyfile/uuid.nim index f267126..b549b9e 100644 --- a/eth/keyfile/uuid.nim +++ b/eth/keyfile/uuid.nim @@ -18,11 +18,11 @@ {.push raises: [Defect].} -import stew/[byteutils, endians2, result] +import stew/[byteutils, endians2, results] from nimcrypto import stripSpaces -export result +export results type UUID* = object diff --git a/eth/keys.nim b/eth/keys.nim index a57334f..6226c36 100644 --- a/eth/keys.nim +++ b/eth/keys.nim @@ -16,11 +16,11 @@ import nimcrypto/hash, nimcrypto/keccak, ./keys/secp, - stew/[byteutils, objects, result], strformat + stew/[byteutils, objects, results], strformat from nimcrypto/utils import burnMem -export secp, result +export secp, results const KeyLength* = SkEcdhRawSecretSize - 1 diff --git a/eth/keys/secp.nim b/eth/keys/secp.nim index 1cb45b2..3fa9523 100644 --- a/eth/keys/secp.nim +++ b/eth/keys/secp.nim @@ -12,12 +12,12 @@ import strformat, secp256k1, - stew/[byteutils, objects, result], + stew/[byteutils, objects, results], nimcrypto/[hash, sysrand] from nimcrypto/utils import burnMem -export result +export results # Implementation notes # @@ -93,7 +93,7 @@ type # (`y` is 0x02 when pubkey.y is even or 0x03 when odd) data*: array[SkEcdhRawSecretSize, byte] - SkResult*[T] = result.Result[T, cstring] + SkResult*[T] = Result[T, cstring] ## ## Private procedures interface diff --git a/eth/net/nat.nim b/eth/net/nat.nim index 07f0c3c..13bbef6 100644 --- a/eth/net/nat.nim +++ b/eth/net/nat.nim @@ -8,7 +8,7 @@ import options, os, strutils, times, - stew/result, nat_traversal/[miniupnpc, natpmp], + stew/results, nat_traversal/[miniupnpc, natpmp], chronicles, json_serialization/std/net type diff --git a/eth/p2p/auth.nim b/eth/p2p/auth.nim index 8f4bbf6..33804fe 100644 --- a/eth/p2p/auth.nim +++ b/eth/p2p/auth.nim @@ -14,9 +14,9 @@ import eth/[keys, rlp], nimcrypto import ecies -import stew/[byteutils, endians2, result] +import stew/[byteutils, endians2, results] -export result +export results const SupportedRlpxVersion* = 4'u8 diff --git a/eth/p2p/discovery.nim b/eth/p2p/discovery.nim index 2ebeb53..2daae63 100644 --- a/eth/p2p/discovery.nim +++ b/eth/p2p/discovery.nim @@ -13,10 +13,10 @@ import chronos, stint, nimcrypto, chronicles, eth/[keys, rlp], kademlia, enode, - stew/result + stew/results export - Node, result + Node, results logScope: topics = "discovery" diff --git a/eth/p2p/ecies.nim b/eth/p2p/ecies.nim index 4f9d423..723cebc 100644 --- a/eth/p2p/ecies.nim +++ b/eth/p2p/ecies.nim @@ -13,9 +13,9 @@ {.push raises: [Defect].} import eth/keys, nimcrypto/[rijndael, bcmode, hash, hmac, sysrand, sha2, utils] -import stew/result +import stew/results -export result +export results const emptyMac* = array[0, byte]([]) diff --git a/eth/p2p/rlpxcrypt.nim b/eth/p2p/rlpxcrypt.nim index f158e40..928a70a 100644 --- a/eth/p2p/rlpxcrypt.nim +++ b/eth/p2p/rlpxcrypt.nim @@ -12,10 +12,10 @@ {.push raises: [Defect].} -import stew/ranges/stackarrays, eth/rlp/types, nimcrypto, stew/result +import stew/ranges/stackarrays, eth/rlp/types, nimcrypto, stew/results from auth import ConnectionSecret -export result +export results const RlpHeaderLength* = 16