mirror of https://github.com/waku-org/nwaku.git
fix: replace nim's std/nre with nim-regex library
This commit is contained in:
parent
83ae6987b8
commit
0e1dae5956
|
@ -153,3 +153,13 @@
|
|||
url = https://github.com/vacp2p/zerokit.git
|
||||
ignore = dirty
|
||||
branch = master
|
||||
[submodule "vendor/nim-regex"]
|
||||
path = vendor/nim-regex
|
||||
url = https://github.com/nitely/nim-regex.git
|
||||
ignore = untracked
|
||||
branch = master
|
||||
[submodule "vendor/nim-unicodedb"]
|
||||
path = vendor/nim-unicodedb
|
||||
url = https://github.com/nitely/nim-unicodedb.git
|
||||
ignore = untracked
|
||||
branch = master
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
import
|
||||
std/[strutils, nre],
|
||||
std/strutils,
|
||||
stew/results,
|
||||
chronicles,
|
||||
chronos,
|
||||
regex,
|
||||
confutils,
|
||||
confutils/defs,
|
||||
confutils/std/net,
|
||||
|
@ -473,8 +474,7 @@ proc defaultListenAddress*(): ValidIpAddress =
|
|||
proc defaultPrivateKey*(): PrivateKey =
|
||||
crypto.PrivateKey.random(Secp256k1, crypto.newRng()[]).value
|
||||
|
||||
proc readValue*(r: var TomlReader, val: var crypto.PrivateKey)
|
||||
{.raises: [Defect, IOError, SerializationError].} =
|
||||
proc readValue*(r: var TomlReader, val: var crypto.PrivateKey) {.raises: [SerializationError].} =
|
||||
val = try: parseCmdArg(crypto.PrivateKey, r.readValue(string))
|
||||
except CatchableError as err:
|
||||
raise newException(SerializationError, err.msg)
|
||||
|
@ -487,7 +487,7 @@ let DbUrlRegex = re"^[\w\+]+:\/\/[\w\/\\\.\:\@]+$"
|
|||
proc validateDbUrl*(val: string): ConfResult[string] =
|
||||
let val = val.strip()
|
||||
|
||||
if val == "" or val.match(DbUrlRegex).isSome():
|
||||
if val == "" or val.match(DbUrlRegex):
|
||||
return ok(val)
|
||||
else:
|
||||
return err("invalid 'db url' option format: " & val)
|
||||
|
@ -498,7 +498,7 @@ let StoreMessageRetentionPolicyRegex = re"^\w+:\w$"
|
|||
proc validateStoreMessageRetentionPolicy*(val: string): ConfResult[string] =
|
||||
let val = val.strip()
|
||||
|
||||
if val == "" or val.match(StoreMessageRetentionPolicyRegex).isSome():
|
||||
if val == "" or val.match(StoreMessageRetentionPolicyRegex):
|
||||
return ok(val)
|
||||
else:
|
||||
return err("invalid 'store message retention policy' option format: " & val)
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Subproject commit ab98735539ddd8a1eaaa795fd2ca65293c1640b3
|
|
@ -0,0 +1 @@
|
|||
Subproject commit c3c9ae079ab2eed33ffe5ca27ec4013beed7647f
|
|
@ -8,7 +8,7 @@ license = "MIT or Apache License 2.0"
|
|||
#bin = @["build/waku"]
|
||||
|
||||
### Dependencies
|
||||
requires "nim >= 1.2.0",
|
||||
requires "nim >= 1.6.0",
|
||||
"chronicles",
|
||||
"confutils",
|
||||
"chronos",
|
||||
|
@ -21,7 +21,8 @@ requires "nim >= 1.2.0",
|
|||
"metrics",
|
||||
"libp2p", # Only for Waku v2
|
||||
"web3",
|
||||
"presto"
|
||||
"presto",
|
||||
"regex"
|
||||
|
||||
### Helper functions
|
||||
proc buildBinary(name: string, srcDir = "./", params = "", lang = "c") =
|
||||
|
|
Loading…
Reference in New Issue