From 2c7abb03dab0e2155402c301f611bd7257a973c0 Mon Sep 17 00:00:00 2001 From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com> Date: Mon, 6 Oct 2025 15:38:39 +0200 Subject: [PATCH] bump nim-json-serialization with the escaping fix, added test case to cover backslash escaping --- tests/wakunode_rest/test_rest_relay.nim | 18 +++++++++--------- vendor/nim-json-serialization | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/wakunode_rest/test_rest_relay.nim b/tests/wakunode_rest/test_rest_relay.nim index 2a1954d3c..442a911ad 100644 --- a/tests/wakunode_rest/test_rest_relay.nim +++ b/tests/wakunode_rest/test_rest_relay.nim @@ -195,7 +195,7 @@ suite "Waku v2 Rest API - Relay": var messages = @[ fakeWakuMessage( - contentTopic = "content-topic-x", + contentTopic = fmt "\\x/content-topic\\\\\\x", payload = toBytes("TEST-1"), meta = toBytes("test-meta"), ephemeral = true, @@ -205,7 +205,7 @@ suite "Waku v2 Rest API - Relay": # Prevent duplicate messages for i in 0 ..< 2: var msg = fakeWakuMessage( - contentTopic = "content-topic-x", + contentTopic = fmt "\\x/content-topic\\\\\\x", payload = toBytes("TEST-1"), meta = toBytes("test-meta"), ephemeral = true, @@ -213,7 +213,7 @@ suite "Waku v2 Rest API - Relay": while msg == messages[i]: msg = fakeWakuMessage( - contentTopic = "content-topic-x", + contentTopic = fmt "\\x/content-topic\\\\\\x", payload = toBytes("TEST-1"), meta = toBytes("test-meta"), ephemeral = true, @@ -241,7 +241,7 @@ suite "Waku v2 Rest API - Relay": response.data.len == 3 response.data.all do(msg: RelayWakuMessage) -> bool: msg.payload == base64.encode("TEST-1") and - msg.contentTopic.get() == "content-topic-x" and msg.version.get() == 2 and + msg.contentTopic.get() == "\\x/content-topic\\\\\\x" and msg.version.get() == 2 and msg.timestamp.get() != Timestamp(0) and msg.meta.get() == base64.encode("test-meta") and msg.ephemeral.get() == true @@ -263,7 +263,7 @@ suite "Waku v2 Rest API - Relay": await node.mountRlnRelay(wakuRlnConfig) await node.start() - # Registration is mandatory before sending messages with rln-relay + # Registration is mandatory before sending messages with rln-relay let manager = cast[OnchainGroupManager](node.wakuRlnRelay.groupManager) let idCredentials = generateCredentials(manager.rlnInstance) @@ -514,7 +514,7 @@ suite "Waku v2 Rest API - Relay": await node.mountRlnRelay(wakuRlnConfig) await node.start() - # Registration is mandatory before sending messages with rln-relay + # Registration is mandatory before sending messages with rln-relay let manager = cast[OnchainGroupManager](node.wakuRlnRelay.groupManager) let idCredentials = generateCredentials(manager.rlnInstance) @@ -586,7 +586,7 @@ suite "Waku v2 Rest API - Relay": await node.mountRlnRelay(wakuRlnConfig) await node.start() - # Registration is mandatory before sending messages with rln-relay + # Registration is mandatory before sending messages with rln-relay let manager = cast[OnchainGroupManager](node.wakuRlnRelay.groupManager) let idCredentials = generateCredentials(manager.rlnInstance) @@ -648,7 +648,7 @@ suite "Waku v2 Rest API - Relay": await node.mountRlnRelay(wakuRlnConfig) await node.start() - # Registration is mandatory before sending messages with rln-relay + # Registration is mandatory before sending messages with rln-relay let manager = cast[OnchainGroupManager](node.wakuRlnRelay.groupManager) let idCredentials = generateCredentials(manager.rlnInstance) @@ -723,7 +723,7 @@ suite "Waku v2 Rest API - Relay": await node.mountRlnRelay(wakuRlnConfig) await node.start() - # Registration is mandatory before sending messages with rln-relay + # Registration is mandatory before sending messages with rln-relay let manager = cast[OnchainGroupManager](node.wakuRlnRelay.groupManager) let idCredentials = generateCredentials(manager.rlnInstance) diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization index 0640259af..5725f63d7 160000 --- a/vendor/nim-json-serialization +++ b/vendor/nim-json-serialization @@ -1 +1 @@ -Subproject commit 0640259af2fad330ea28e77359c0d0cefac5a361 +Subproject commit 5725f63d7b4112d209786f4a2cfcf882351fdf5e