From f34a044ccfecd3d32732494e0e09f748085b88f0 Mon Sep 17 00:00:00 2001 From: Ivan FB <128452529+Ivansete-status@users.noreply.github.com> Date: Tue, 10 Sep 2024 17:30:09 +0200 Subject: [PATCH] chore: lightpush - error metric less variable by only setting a fixed string (#3020) --- tests/node/test_wakunode_lightpush.nim | 15 +++++---------- waku/waku_lightpush/callbacks.nim | 5 ++--- waku/waku_lightpush/protocol_metrics.nim | 1 + 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/tests/node/test_wakunode_lightpush.nim b/tests/node/test_wakunode_lightpush.nim index fba46e212..30158ebd1 100644 --- a/tests/node/test_wakunode_lightpush.nim +++ b/tests/node/test_wakunode_lightpush.nim @@ -88,11 +88,9 @@ suite "Waku Lightpush - End To End": # Then the message is not relayed but not due to RLN assert publishResponse.isErr(), "We expect an error response" - assert ( - publishResponse.error.contains( - "Lightpush request has not been published to any peers" - ) - ), "incorrect error response" + + assert (publishResponse.error == protocol_metrics.notPublishedAnyPeer), + "incorrect error response" suite "Waku LightPush Validation Tests": asyncTest "Validate message size exceeds limit": @@ -181,8 +179,5 @@ suite "RLN Proofs as a Lightpush Service": # Then the message is not relayed but not due to RLN assert publishResponse.isErr(), "We expect an error response" - assert ( - publishResponse.error.contains( - "Lightpush request has not been published to any peers" - ) - ), "incorrect error response" + assert (publishResponse.error == protocol_metrics.notPublishedAnyPeer), + "incorrect error response" diff --git a/waku/waku_lightpush/callbacks.nim b/waku/waku_lightpush/callbacks.nim index 93128fd10..1c0396f25 100644 --- a/waku/waku_lightpush/callbacks.nim +++ b/waku/waku_lightpush/callbacks.nim @@ -5,6 +5,7 @@ import ../waku_relay, ./common, ./protocol, + ./protocol_metrics, ../waku_rln_relay, ../waku_rln_relay/protocol_types @@ -54,8 +55,6 @@ proc getRelayPushHandler*( ## Agreed change expected to the lightpush protocol to better handle such case. https://github.com/waku-org/pm/issues/93 let msgHash = computeMessageHash(pubsubTopic, message).to0xHex() notice "Lightpush request has not been published to any peers", msg_hash = msgHash - return err( - "Lightpush request has not been published to any peers. msg_hash: " & msgHash - ) + return err(protocol_metrics.notPublishedAnyPeer) return ok() diff --git a/waku/waku_lightpush/protocol_metrics.nim b/waku/waku_lightpush/protocol_metrics.nim index 7a30f9e70..ce48a7d3d 100644 --- a/waku/waku_lightpush/protocol_metrics.nim +++ b/waku/waku_lightpush/protocol_metrics.nim @@ -16,3 +16,4 @@ const emptyResponseBodyFailure* = "empty_response_body_failure" messagePushFailure* = "message_push_failure" requestLimitReachedFailure* = "request_limit_reached_failure" + notPublishedAnyPeer* = "not_published_to_any_peer"