mirror of
https://github.com/waku-org/nwaku.git
synced 2025-02-28 15:00:57 +00:00
chore: Bump nimbus and nim to latest available - nim-2.0.12 (#3188)
* Bump nimbus and nim to latest available - nim-2.0.12 * Fix name collision of templates of result.nim and nwaku serdes.nim - unrecognizedFieldWarning
This commit is contained in:
parent
650a9487e1
commit
e2b7149f82
@ -87,7 +87,7 @@ proc readValue*(
|
|||||||
)
|
)
|
||||||
size = some(reader.readValue(uint64))
|
size = some(reader.readValue(uint64))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if sender.isNone():
|
if sender.isNone():
|
||||||
reader.raiseUnexpectedValue("Field `sender` is missing")
|
reader.raiseUnexpectedValue("Field `sender` is missing")
|
||||||
|
2
vendor/nimbus-build-system
vendored
2
vendor/nimbus-build-system
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 741274439ce72162ab3c740e7c0ef624d32725f9
|
Subproject commit 8fafcd0bac9f409091b7bcaee62ab6330f57441e
|
@ -83,7 +83,7 @@ proc readValue*(
|
|||||||
)
|
)
|
||||||
connected = some(reader.readValue(bool))
|
connected = some(reader.readValue(bool))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if connected.isNone():
|
if connected.isNone():
|
||||||
reader.raiseUnexpectedValue("Field `connected` is missing")
|
reader.raiseUnexpectedValue("Field `connected` is missing")
|
||||||
@ -116,7 +116,7 @@ proc readValue*(
|
|||||||
reader.raiseUnexpectedField("Multiple `origin` fields found", "WakuPeer")
|
reader.raiseUnexpectedField("Multiple `origin` fields found", "WakuPeer")
|
||||||
origin = some(reader.readValue(PeerOrigin))
|
origin = some(reader.readValue(PeerOrigin))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if multiaddr.isNone():
|
if multiaddr.isNone():
|
||||||
reader.raiseUnexpectedValue("Field `multiaddr` is missing")
|
reader.raiseUnexpectedValue("Field `multiaddr` is missing")
|
||||||
@ -153,7 +153,7 @@ proc readValue*(
|
|||||||
)
|
)
|
||||||
contentTopic = some(reader.readValue(string))
|
contentTopic = some(reader.readValue(string))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if pubsubTopic.isNone():
|
if pubsubTopic.isNone():
|
||||||
reader.raiseUnexpectedValue("Field `pubsubTopic` is missing")
|
reader.raiseUnexpectedValue("Field `pubsubTopic` is missing")
|
||||||
@ -185,7 +185,7 @@ proc readValue*(
|
|||||||
)
|
)
|
||||||
filterCriteria = some(reader.readValue(seq[FilterTopic]))
|
filterCriteria = some(reader.readValue(seq[FilterTopic]))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if peerId.isNone():
|
if peerId.isNone():
|
||||||
reader.raiseUnexpectedValue("Field `peerId` is missing")
|
reader.raiseUnexpectedValue("Field `peerId` is missing")
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import chronicles, json_serialization, json_serialization/std/options
|
import chronicles, json_serialization, json_serialization/std/options
|
||||||
import ../../../waku_node, ../serdes
|
import ../../../waku_node, ../serdes
|
||||||
|
import std/typetraits
|
||||||
|
|
||||||
#### Types
|
#### Types
|
||||||
|
|
||||||
@ -47,7 +48,7 @@ proc readValue*(
|
|||||||
reader.raiseUnexpectedField("Multiple `enrUri` fields found", "DebugWakuInfo")
|
reader.raiseUnexpectedField("Multiple `enrUri` fields found", "DebugWakuInfo")
|
||||||
enrUri = some(reader.readValue(string))
|
enrUri = some(reader.readValue(string))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if listenAddresses.isNone():
|
if listenAddresses.isNone():
|
||||||
reader.raiseUnexpectedValue("Field `listenAddresses` is missing")
|
reader.raiseUnexpectedValue("Field `listenAddresses` is missing")
|
||||||
|
@ -187,7 +187,7 @@ proc readValue*(
|
|||||||
of "ephemeral":
|
of "ephemeral":
|
||||||
ephemeral = some(reader.readValue(bool))
|
ephemeral = some(reader.readValue(bool))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if payload.isNone():
|
if payload.isNone():
|
||||||
reader.raiseUnexpectedValue("Field `payload` is missing")
|
reader.raiseUnexpectedValue("Field `payload` is missing")
|
||||||
@ -225,7 +225,7 @@ proc readValue*(
|
|||||||
of "contentFilters":
|
of "contentFilters":
|
||||||
contentFilters = some(reader.readValue(seq[ContentTopic]))
|
contentFilters = some(reader.readValue(seq[ContentTopic]))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if contentFilters.isNone():
|
if contentFilters.isNone():
|
||||||
reader.raiseUnexpectedValue("Field `contentFilters` is missing")
|
reader.raiseUnexpectedValue("Field `contentFilters` is missing")
|
||||||
@ -262,7 +262,7 @@ proc readValue*(
|
|||||||
of "requestId":
|
of "requestId":
|
||||||
requestId = some(reader.readValue(string))
|
requestId = some(reader.readValue(string))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if requestId.isNone():
|
if requestId.isNone():
|
||||||
reader.raiseUnexpectedValue("Field `requestId` is missing")
|
reader.raiseUnexpectedValue("Field `requestId` is missing")
|
||||||
@ -296,7 +296,7 @@ proc readValue*(
|
|||||||
of "contentFilters":
|
of "contentFilters":
|
||||||
contentFilters = some(reader.readValue(seq[ContentTopic]))
|
contentFilters = some(reader.readValue(seq[ContentTopic]))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if requestId.isNone():
|
if requestId.isNone():
|
||||||
reader.raiseUnexpectedValue("Field `requestId` is missing")
|
reader.raiseUnexpectedValue("Field `requestId` is missing")
|
||||||
@ -344,7 +344,7 @@ proc readValue*(
|
|||||||
of "contentFilters":
|
of "contentFilters":
|
||||||
contentFilters = some(reader.readValue(seq[ContentTopic]))
|
contentFilters = some(reader.readValue(seq[ContentTopic]))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if requestId.isNone():
|
if requestId.isNone():
|
||||||
reader.raiseUnexpectedValue("Field `requestId` is missing")
|
reader.raiseUnexpectedValue("Field `requestId` is missing")
|
||||||
@ -385,7 +385,7 @@ proc readValue*(
|
|||||||
of "requestId":
|
of "requestId":
|
||||||
requestId = some(reader.readValue(string))
|
requestId = some(reader.readValue(string))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if requestId.isNone():
|
if requestId.isNone():
|
||||||
reader.raiseUnexpectedValue("Field `requestId` is missing")
|
reader.raiseUnexpectedValue("Field `requestId` is missing")
|
||||||
@ -416,7 +416,7 @@ proc readValue*(
|
|||||||
of "statusDesc":
|
of "statusDesc":
|
||||||
statusDesc = some(reader.readValue(string))
|
statusDesc = some(reader.readValue(string))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if requestId.isNone():
|
if requestId.isNone():
|
||||||
reader.raiseUnexpectedValue("Field `requestId` is missing")
|
reader.raiseUnexpectedValue("Field `requestId` is missing")
|
||||||
|
@ -65,7 +65,7 @@ proc readValue*(
|
|||||||
|
|
||||||
protocolsHealth = some(reader.readValue(seq[ProtocolHealth]))
|
protocolsHealth = some(reader.readValue(seq[ProtocolHealth]))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if nodeHealth.isNone():
|
if nodeHealth.isNone():
|
||||||
reader.raiseUnexpectedValue("Field `nodeHealth` is missing")
|
reader.raiseUnexpectedValue("Field `nodeHealth` is missing")
|
||||||
|
@ -52,7 +52,7 @@ proc readValue*(
|
|||||||
of "message":
|
of "message":
|
||||||
message = some(reader.readValue(RelayWakuMessage))
|
message = some(reader.readValue(RelayWakuMessage))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if message.isNone():
|
if message.isNone():
|
||||||
reader.raiseUnexpectedValue("Field `message` is missing")
|
reader.raiseUnexpectedValue("Field `message` is missing")
|
||||||
|
@ -117,7 +117,7 @@ proc readValue*(
|
|||||||
of "ephemeral":
|
of "ephemeral":
|
||||||
ephemeral = some(reader.readValue(bool))
|
ephemeral = some(reader.readValue(bool))
|
||||||
else:
|
else:
|
||||||
unrecognizedFieldWarning()
|
unrecognizedFieldWarning(value)
|
||||||
|
|
||||||
if payload.isNone() or isEmptyOrWhitespace(string(payload.get())):
|
if payload.isNone() or isEmptyOrWhitespace(string(payload.get())):
|
||||||
reader.raiseUnexpectedValue("Field `payload` is missing or empty")
|
reader.raiseUnexpectedValue("Field `payload` is missing or empty")
|
||||||
|
@ -20,12 +20,12 @@ createJsonFlavor RestJson
|
|||||||
|
|
||||||
Json.setWriter JsonWriter, PreferredOutput = string
|
Json.setWriter JsonWriter, PreferredOutput = string
|
||||||
|
|
||||||
template unrecognizedFieldWarning*() =
|
template unrecognizedFieldWarning*(field: typed) =
|
||||||
# TODO: There should be a different notification mechanism for informing the
|
# TODO: There should be a different notification mechanism for informing the
|
||||||
# caller of a deserialization routine for unexpected fields.
|
# caller of a deserialization routine for unexpected fields.
|
||||||
# The chonicles import in this module should be removed.
|
# The chonicles import in this module should be removed.
|
||||||
debug "JSON field not recognized by the current version of nwaku. Consider upgrading",
|
debug "JSON field not recognized by the current version of nwaku. Consider upgrading",
|
||||||
fieldName, typeName = typetraits.name(typeof value)
|
fieldName, typeName = typetraits.name(typeof field)
|
||||||
|
|
||||||
type SerdesResult*[T] = Result[T, cstring]
|
type SerdesResult*[T] = Result[T, cstring]
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user