waku-org/nwaku
1
0
Fork 0
mirror of https://github.com/waku-org/nwaku.git synced 2025-02-25 13:26:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: replace TaintedString type deprecated in nim 1.5

Browse Source
This commit is contained in:
Lorenzo Delgado 2022-11-02 14:55:48 +01:00 committed by GitHub
parent 8fee1b9bed
commit 83ae6987b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/chat2/config_chat2.nim
View File

@ -297,7 +297,7 @@ type
name: "rln-relay-cred-password" }: string name: "rln-relay-cred-password" }: string
# NOTE: Keys are different in nim-libp2p # NOTE: Keys are different in nim-libp2p
proc parseCmdArg*(T: type crypto.PrivateKey, p: TaintedString): T = proc parseCmdArg*(T: type crypto.PrivateKey, p: string): T =
try: try:
let key = SkPrivateKey.init(utils.fromHex(p)).tryGet() let key = SkPrivateKey.init(utils.fromHex(p)).tryGet()
# XXX: Here at the moment # XXX: Here at the moment
@ -305,25 +305,25 @@ proc parseCmdArg*(T: type crypto.PrivateKey, p: TaintedString): T =
except CatchableError as e: except CatchableError as e:
raise newException(ConfigurationError, "Invalid private key") raise newException(ConfigurationError, "Invalid private key")
proc completeCmdArg*(T: type crypto.PrivateKey, val: TaintedString): seq[string] = proc completeCmdArg*(T: type crypto.PrivateKey, val: string): seq[string] =
return @[] return @[]
proc parseCmdArg*(T: type ValidIpAddress, p: TaintedString): T = proc parseCmdArg*(T: type ValidIpAddress, p: string): T =
try: try:
result = ValidIpAddress.init(p) result = ValidIpAddress.init(p)
except CatchableError as e: except CatchableError as e:
raise newException(ConfigurationError, "Invalid IP address") raise newException(ConfigurationError, "Invalid IP address")
proc completeCmdArg*(T: type ValidIpAddress, val: TaintedString): seq[string] = proc completeCmdArg*(T: type ValidIpAddress, val: string): seq[string] =
return @[] return @[]
proc parseCmdArg*(T: type Port, p: TaintedString): T = proc parseCmdArg*(T: type Port, p: string): T =
try: try:
result = Port(parseInt(p)) result = Port(parseInt(p))
except CatchableError as e: except CatchableError as e:
raise newException(ConfigurationError, "Invalid Port number") raise newException(ConfigurationError, "Invalid Port number")
proc completeCmdArg*(T: type Port, val: TaintedString): seq[string] = proc completeCmdArg*(T: type Port, val: string): seq[string] =
return @[] return @[]
func defaultListenAddress*(conf: Chat2Conf): ValidIpAddress = func defaultListenAddress*(conf: Chat2Conf): ValidIpAddress =

12
apps/chat2bridge/config_chat2bridge.nim
View File

@ -129,33 +129,33 @@ type
defaultValue: "/toy-chat/2/huilong/proto" defaultValue: "/toy-chat/2/huilong/proto"
name: "content-topic" }: string name: "content-topic" }: string
proc parseCmdArg*(T: type keys.KeyPair, p: TaintedString): T = proc parseCmdArg*(T: type keys.KeyPair, p: string): T =
try: try:
let privkey = keys.PrivateKey.fromHex(string(p)).tryGet() let privkey = keys.PrivateKey.fromHex(string(p)).tryGet()
result = privkey.toKeyPair() result = privkey.toKeyPair()
except CatchableError: except CatchableError:
raise newException(ConfigurationError, "Invalid private key") raise newException(ConfigurationError, "Invalid private key")
proc completeCmdArg*(T: type keys.KeyPair, val: TaintedString): seq[string] = proc completeCmdArg*(T: type keys.KeyPair, val: string): seq[string] =
return @[] return @[]
proc parseCmdArg*(T: type crypto.PrivateKey, p: TaintedString): T = proc parseCmdArg*(T: type crypto.PrivateKey, p: string): T =
let key = SkPrivateKey.init(p) let key = SkPrivateKey.init(p)
if key.isOk(): if key.isOk():
crypto.PrivateKey(scheme: Secp256k1, skkey: key.get()) crypto.PrivateKey(scheme: Secp256k1, skkey: key.get())
else: else:
raise newException(ConfigurationError, "Invalid private key") raise newException(ConfigurationError, "Invalid private key")
proc completeCmdArg*(T: type crypto.PrivateKey, val: TaintedString): seq[string] = proc completeCmdArg*(T: type crypto.PrivateKey, val: string): seq[string] =
return @[] return @[]
proc parseCmdArg*(T: type ValidIpAddress, p: TaintedString): T = proc parseCmdArg*(T: type ValidIpAddress, p: string): T =
try: try:
result = ValidIpAddress.init(p) result = ValidIpAddress.init(p)
except CatchableError: except CatchableError:
raise newException(ConfigurationError, "Invalid IP address") raise newException(ConfigurationError, "Invalid IP address")
proc completeCmdArg*(T: type ValidIpAddress, val: TaintedString): seq[string] = proc completeCmdArg*(T: type ValidIpAddress, val: string): seq[string] =
return @[] return @[]
func defaultListenAddress*(conf: Chat2MatterbridgeConf): ValidIpAddress = func defaultListenAddress*(conf: Chat2MatterbridgeConf): ValidIpAddress =

12
apps/wakubridge/config_bridge.nim
View File

@ -151,33 +151,33 @@ type
defaultValue: "/waku/2/default-waku/proto" defaultValue: "/waku/2/default-waku/proto"
name: "bridge-pubsub-topic" }: string name: "bridge-pubsub-topic" }: string
proc parseCmdArg*(T: type keys.KeyPair, p: TaintedString): T = proc parseCmdArg*(T: type keys.KeyPair, p: string): T =
try: try:
let privkey = keys.PrivateKey.fromHex(string(p)).tryGet() let privkey = keys.PrivateKey.fromHex(string(p)).tryGet()
result = privkey.toKeyPair() result = privkey.toKeyPair()
except CatchableError: except CatchableError:
raise newException(ConfigurationError, "Invalid private key") raise newException(ConfigurationError, "Invalid private key")
proc completeCmdArg*(T: type keys.KeyPair, val: TaintedString): seq[string] = proc completeCmdArg*(T: type keys.KeyPair, val: string): seq[string] =
return @[] return @[]
proc parseCmdArg*(T: type crypto.PrivateKey, p: TaintedString): T = proc parseCmdArg*(T: type crypto.PrivateKey, p: string): T =
let key = SkPrivateKey.init(p) let key = SkPrivateKey.init(p)
if key.isOk(): if key.isOk():
crypto.PrivateKey(scheme: Secp256k1, skkey: key.get()) crypto.PrivateKey(scheme: Secp256k1, skkey: key.get())
else: else:
raise newException(ConfigurationError, "Invalid private key") raise newException(ConfigurationError, "Invalid private key")
proc completeCmdArg*(T: type crypto.PrivateKey, val: TaintedString): seq[string] = proc completeCmdArg*(T: type crypto.PrivateKey, val: string): seq[string] =
return @[] return @[]
proc parseCmdArg*(T: type ValidIpAddress, p: TaintedString): T = proc parseCmdArg*(T: type ValidIpAddress, p: string): T =
try: try:
result = ValidIpAddress.init(p) result = ValidIpAddress.init(p)
except CatchableError: except CatchableError:
raise newException(ConfigurationError, "Invalid IP address") raise newException(ConfigurationError, "Invalid IP address")
proc completeCmdArg*(T: type ValidIpAddress, val: TaintedString): seq[string] = proc completeCmdArg*(T: type ValidIpAddress, val: string): seq[string] =
return @[] return @[]
func defaultListenAddress*(conf: WakuNodeConf): ValidIpAddress = func defaultListenAddress*(conf: WakuNodeConf): ValidIpAddress =

12
apps/wakunode2/config.nim
View File

@ -436,7 +436,7 @@ type
name: "websocket-secure-cert-path"}: string name: "websocket-secure-cert-path"}: string
# NOTE: Keys are different in nim-libp2p # NOTE: Keys are different in nim-libp2p
proc parseCmdArg*(T: type crypto.PrivateKey, p: TaintedString): T = proc parseCmdArg*(T: type crypto.PrivateKey, p: string): T =
try: try:
let key = SkPrivateKey.init(utils.fromHex(p)).tryGet() let key = SkPrivateKey.init(utils.fromHex(p)).tryGet()
# XXX: Here at the moment # XXX: Here at the moment
@ -444,25 +444,25 @@ proc parseCmdArg*(T: type crypto.PrivateKey, p: TaintedString): T =
except CatchableError as e: except CatchableError as e:
raise newException(ConfigurationError, "Invalid private key") raise newException(ConfigurationError, "Invalid private key")
proc completeCmdArg*(T: type crypto.PrivateKey, val: TaintedString): seq[string] = proc completeCmdArg*(T: type crypto.PrivateKey, val: string): seq[string] =
return @[] return @[]
proc parseCmdArg*(T: type ValidIpAddress, p: TaintedString): T = proc parseCmdArg*(T: type ValidIpAddress, p: string): T =
try: try:
result = ValidIpAddress.init(p) result = ValidIpAddress.init(p)
except CatchableError as e: except CatchableError as e:
raise newException(ConfigurationError, "Invalid IP address") raise newException(ConfigurationError, "Invalid IP address")
proc completeCmdArg*(T: type ValidIpAddress, val: TaintedString): seq[string] = proc completeCmdArg*(T: type ValidIpAddress, val: string): seq[string] =
return @[] return @[]
proc parseCmdArg*(T: type Port, p: TaintedString): T = proc parseCmdArg*(T: type Port, p: string): T =
try: try:
result = Port(parseInt(p)) result = Port(parseInt(p))
except CatchableError as e: except CatchableError as e:
raise newException(ConfigurationError, "Invalid Port number") raise newException(ConfigurationError, "Invalid Port number")
proc completeCmdArg*(T: type Port, val: TaintedString): seq[string] = proc completeCmdArg*(T: type Port, val: string): seq[string] =
return @[] return @[]
proc defaultListenAddress*(): ValidIpAddress = proc defaultListenAddress*(): ValidIpAddress =

8
examples/v1/config_example.nim
View File

@ -45,21 +45,21 @@ type
defaultValue: KeyPair.random(keys.newRng()[]) defaultValue: KeyPair.random(keys.newRng()[])
name: "nodekey" .}: KeyPair name: "nodekey" .}: KeyPair
proc parseCmdArg*(T: type KeyPair, p: TaintedString): T = proc parseCmdArg*(T: type KeyPair, p: string): T =
try: try:
let privkey = PrivateKey.fromHex(string(p)).tryGet() let privkey = PrivateKey.fromHex(string(p)).tryGet()
result = privkey.toKeyPair() result = privkey.toKeyPair()
except CatchableError as e: except CatchableError as e:
raise newException(ConfigurationError, "Invalid private key") raise newException(ConfigurationError, "Invalid private key")
proc completeCmdArg*(T: type KeyPair, val: TaintedString): seq[string] = proc completeCmdArg*(T: type KeyPair, val: string): seq[string] =
return @[] return @[]
proc parseCmdArg*(T: type IpAddress, p: TaintedString): T = proc parseCmdArg*(T: type IpAddress, p: string): T =
try: try:
result = parseIpAddress(p) result = parseIpAddress(p)
except CatchableError as e: except CatchableError as e:
raise newException(ConfigurationError, "Invalid IP address") raise newException(ConfigurationError, "Invalid IP address")
proc completeCmdArg*(T: type IpAddress, val: TaintedString): seq[string] = proc completeCmdArg*(T: type IpAddress, val: string): seq[string] =
return @[] return @[]

4
tools/wakucanary/wakucanary.nim
View File

@ -51,13 +51,13 @@ type
abbr: "l" .}: LogLevel abbr: "l" .}: LogLevel
proc parseCmdArg*(T: type chronos.Duration, p: TaintedString): T = proc parseCmdArg*(T: type chronos.Duration, p: string): T =
try: try:
result = chronos.seconds(parseInt(p)) result = chronos.seconds(parseInt(p))
except CatchableError as e: except CatchableError as e:
raise newException(ConfigurationError, "Invalid timeout value") raise newException(ConfigurationError, "Invalid timeout value")
proc completeCmdArg*(T: type chronos.Duration, val: TaintedString): seq[string] = proc completeCmdArg*(T: type chronos.Duration, val: string): seq[string] =
return @[] return @[]
# checks if rawProtocols (skipping version) are supported in nodeProtocols # checks if rawProtocols (skipping version) are supported in nodeProtocols

8
waku/v1/node/config.nim
View File

@ -144,21 +144,21 @@ type
of genNodekey: of genNodekey:
discard discard
proc parseCmdArg*(T: type KeyPair, p: TaintedString): T = proc parseCmdArg*(T: type KeyPair, p: string): T =
try: try:
let privkey = PrivateKey.fromHex(string(p)).tryGet() let privkey = PrivateKey.fromHex(string(p)).tryGet()
result = privkey.toKeyPair() result = privkey.toKeyPair()
except CatchableError: except CatchableError:
raise newException(ConfigurationError, "Invalid private key") raise newException(ConfigurationError, "Invalid private key")
proc completeCmdArg*(T: type KeyPair, val: TaintedString): seq[string] = proc completeCmdArg*(T: type KeyPair, val: string): seq[string] =
return @[] return @[]
proc parseCmdArg*(T: type IpAddress, p: TaintedString): T = proc parseCmdArg*(T: type IpAddress, p: string): T =
try: try:
result = parseIpAddress(p) result = parseIpAddress(p)
except CatchableError: except CatchableError:
raise newException(ConfigurationError, "Invalid IP address") raise newException(ConfigurationError, "Invalid IP address")
proc completeCmdArg*(T: type IpAddress, val: TaintedString): seq[string] = proc completeCmdArg*(T: type IpAddress, val: string): seq[string] =
return @[] return @[]

2
waku/v2/node/discv5/waku_discv5.nim
View File

@ -26,7 +26,7 @@ type
# Helper functions # # Helper functions #
#################### ####################
proc parseBootstrapAddress(address: TaintedString): proc parseBootstrapAddress(address: string):
Result[enr.Record, cstring] = Result[enr.Record, cstring] =
logScope: logScope:
address = string(address) address = string(address)

2
waku/v2/protocol/waku_swap/waku_swap_contracts.nim
View File

@ -21,7 +21,7 @@ type NodeTaskJsonResult = Result[JsonNode, string]
const taskPrelude = "npx hardhat --network localhost " const taskPrelude = "npx hardhat --network localhost "
const cmdPrelude = "cd ../swap-contracts-module; " & taskPrelude const cmdPrelude = "cd ../swap-contracts-module; " & taskPrelude
# proc execNodeTask(taskStr: string): tuple[output: TaintedString, exitCode: int] = # proc execNodeTask(taskStr: string): tuple[output: string, exitCode: int] =
# let cmdString = $cmdPrelude & $taskStr # let cmdString = $cmdPrelude & $taskStr
# debug "execNodeTask", cmdString # debug "execNodeTask", cmdString
# return osproc.execCmdEx(cmdString) # return osproc.execCmdEx(cmdString)