Revert "feat: Added simple, configurable rate limit for lightpush and…

… store-query (#2390)" This reverts commit a00f350.
waku-org · Apr 25, 2024 · 10fea69 · 10fea69
1 parent a00f350
commit 10fea69
Show file tree

Hide file tree

Showing 22 changed files with 29 additions and 686 deletions.
diff --git a/tests/waku_lightpush/lightpush_utils.nim b/tests/waku_lightpush/lightpush_utils.nim
@@ -10,13 +10,11 @@ import
   ../testlib/[common, wakucore]
 
 proc newTestWakuLightpushNode*(
-    switch: Switch,
-    handler: PushMessageHandler,
-    rateLimitSetting: Option[RateLimitSetting] = none[RateLimitSetting](),
+    switch: Switch, handler: PushMessageHandler
 ): Future[WakuLightPush] {.async.} =
   let
     peerManager = PeerManager.new(switch)
-    proto = WakuLightPush.new(peerManager, rng, handler, rateLimitSetting)
+    proto = WakuLightPush.new(peerManager, rng, handler)
 
   await proto.start()
   switch.mount(proto)

diff --git a/tests/waku_lightpush/test_all.nim b/tests/waku_lightpush/test_all.nim
@@ -1 +1 @@
-import ./test_client, ./test_ratelimit
+import ./test_client
diff --git a/tests/waku_lightpush/test_client.nim b/tests/waku_lightpush/test_client.nim
@@ -203,7 +203,7 @@ suite "Waku Lightpush Client":
           # 1KiB
         message2 = fakeWakuMessage(
           contentTopic = contentTopic, payload = getByteSequence(10 * 1024)
-        ) # 10KiB
+        ) # 10KiB 
         message3 = fakeWakuMessage(
           contentTopic = contentTopic, payload = getByteSequence(100 * 1024)
         ) # 100KiB

diff --git a/tests/waku_lightpush/test_ratelimit.nim b/tests/waku_lightpush/test_ratelimit.nim
diff --git a/tests/waku_store/test_wakunode_store.nim b/tests/waku_store/test_wakunode_store.nim
@@ -244,7 +244,9 @@ procSuite "WakuNode - Store":
 
     server.wakuFilterClient.registerPushHandler(filterHandler)
     let resp = waitFor server.filterSubscribe(
-      some(DefaultPubsubTopic), DefaultContentTopic, peer = filterSourcePeer
+      some(DefaultPubsubTopic),
+      DefaultContentTopic,
+      peer = filterSourcePeer,
     )
 
     waitFor sleepAsync(100.millis)
@@ -317,97 +319,3 @@ procSuite "WakuNode - Store":
 
     # Cleanup
     waitFor allFutures(client.stop(), server.stop())
-
-  test "Store protocol queries does not violate request rate limitation":
-    ## Setup
-    let
-      serverKey = generateSecp256k1Key()
-      server = newTestWakuNode(serverKey, parseIpAddress("0.0.0.0"), Port(0))
-      clientKey = generateSecp256k1Key()
-      client = newTestWakuNode(clientKey, parseIpAddress("0.0.0.0"), Port(0))
-
-    waitFor allFutures(client.start(), server.start())
-
-    let mountArchiveRes = server.mountArchive(archiveA)
-    assert mountArchiveRes.isOk(), mountArchiveRes.error
-
-    waitFor server.mountStore((4, 500.millis))
-
-    client.mountStoreClient()
-
-    ## Given
-    let req = HistoryQuery(contentTopics: @[DefaultContentTopic])
-    let serverPeer = server.peerInfo.toRemotePeerInfo()
-
-    let requestProc = proc() {.async.} =
-      let queryRes = waitFor client.query(req, peer = serverPeer)
-
-      assert queryRes.isOk(), queryRes.error
-
-      let response = queryRes.get()
-      check:
-        response.messages == msgListA
-
-    for count in 0 ..< 4:
-      waitFor requestProc()
-      waitFor sleepAsync(20.millis)
-
-    waitFor sleepAsync(500.millis)
-
-    for count in 0 ..< 4:
-      waitFor requestProc()
-      waitFor sleepAsync(20.millis)
-
-    # Cleanup
-    waitFor allFutures(client.stop(), server.stop())
-
-  test "Store protocol queries overrun request rate limitation":
-    ## Setup
-    let
-      serverKey = generateSecp256k1Key()
-      server = newTestWakuNode(serverKey, parseIpAddress("0.0.0.0"), Port(0))
-      clientKey = generateSecp256k1Key()
-      client = newTestWakuNode(clientKey, parseIpAddress("0.0.0.0"), Port(0))
-
-    waitFor allFutures(client.start(), server.start())
-
-    let mountArchiveRes = server.mountArchive(archiveA)
-    assert mountArchiveRes.isOk(), mountArchiveRes.error
-
-    waitFor server.mountStore((3, 500.millis))
-
-    client.mountStoreClient()
-
-    ## Given
-    let req = HistoryQuery(contentTopics: @[DefaultContentTopic])
-    let serverPeer = server.peerInfo.toRemotePeerInfo()
-
-    let successProc = proc() {.async.} =
-      let queryRes = waitFor client.query(req, peer = serverPeer)
-
-      check queryRes.isOk()
-
-      let response = queryRes.get()
-      check:
-        response.messages == msgListA
-
-    let failsProc = proc() {.async.} =
-      let queryRes = waitFor client.query(req, peer = serverPeer)
-
-      check queryRes.isErr()
-      check queryRes.error == "TOO_MANY_REQUESTS"
-
-    for count in 0 ..< 3:
-      waitFor successProc()
-      waitFor sleepAsync(20.millis)
-
-    waitFor failsProc()
-
-    waitFor sleepAsync(500.millis)
-
-    for count in 0 ..< 3:
-      waitFor successProc()
-      waitFor sleepAsync(20.millis)
-
-    # Cleanup
-    waitFor allFutures(client.stop(), server.stop())
diff --git a/tests/wakunode_rest/test_rest_lightpush.nim b/tests/wakunode_rest/test_rest_lightpush.nim
@@ -22,10 +22,8 @@ import
   ../../waku/waku_api/rest/lightpush/handlers as lightpush_api,
   ../../waku/waku_api/rest/lightpush/client as lightpush_api_client,
   ../../waku/waku_relay,
-  ../../waku/common/ratelimit,
   ../testlib/wakucore,
-  ../testlib/wakunode,
-  ../testlib/testutils
+  ../testlib/wakunode
 
 proc testWakuNode(): WakuNode =
   let
@@ -43,9 +41,7 @@ type RestLightPushTest = object
   restServer: WakuRestServerRef
   client: RestClientRef
 
-proc init(
-    T: type RestLightPushTest, rateLimit: RateLimitSetting = (0, 0.millis)
-): Future[T] {.async.} =
+proc init(T: type RestLightPushTest): Future[T] {.async.} =
   var testSetup = RestLightPushTest()
   testSetup.serviceNode = testWakuNode()
   testSetup.pushNode = testWakuNode()
@@ -59,7 +55,7 @@ proc init(
 
   await testSetup.consumerNode.mountRelay()
   await testSetup.serviceNode.mountRelay()
-  await testSetup.serviceNode.mountLightPush(rateLimit)
+  await testSetup.serviceNode.mountLightPush()
   testSetup.pushNode.mountLightPushClient()
 
   testSetup.serviceNode.peerManager.addServicePeer(
@@ -182,74 +178,6 @@ suite "Waku v2 Rest API - lightpush":
 
     await restLightPushTest.shutdown()
 
-  # disabled due to this bug in nim-chronos https://github.com/status-im/nim-chronos/issues/500
-  xasyncTest "Request rate limit push message":
-    # Given
-    let budgetCap = 3
-    let tokenPeriod = 500.millis
-    let restLightPushTest = await RestLightPushTest.init((budgetCap, tokenPeriod))
-
-    restLightPushTest.consumerNode.subscribe(
-      (kind: PubsubSub, topic: DefaultPubsubTopic)
-    )
-    restLightPushTest.serviceNode.subscribe(
-      (kind: PubsubSub, topic: DefaultPubsubTopic)
-    )
-    require:
-      toSeq(restLightPushTest.serviceNode.wakuRelay.subscribedTopics).len == 1
-
-    # When
-    let pushProc = proc() {.async.} =
-      let message: RelayWakuMessage = fakeWakuMessage(
-          contentTopic = DefaultContentTopic, payload = toBytes("TEST-1")
-        )
-        .toRelayWakuMessage()
-
-      let requestBody =
-        PushRequest(pubsubTopic: some(DefaultPubsubTopic), message: message)
-      let response = await restLightPushTest.client.sendPushRequest(requestBody)
-
-      echo "response", $response
-
-      # Then
-      check:
-        response.status == 200
-        $response.contentType == $MIMETYPE_TEXT
-
-    let pushRejectedProc = proc() {.async.} =
-      let message: RelayWakuMessage = fakeWakuMessage(
-          contentTopic = DefaultContentTopic, payload = toBytes("TEST-1")
-        )
-        .toRelayWakuMessage()
-
-      let requestBody =
-        PushRequest(pubsubTopic: some(DefaultPubsubTopic), message: message)
-      let response = await restLightPushTest.client.sendPushRequest(requestBody)
-
-      echo "response", $response
-
-      # Then
-      check:
-        response.status == 429
-
-    await pushProc()
-    await pushProc()
-    await pushProc()
-    await pushRejectedProc()
-
-    await sleepAsync(tokenPeriod)
-
-    for runCnt in 0 ..< 3:
-      let startTime = Moment.now()
-      for sendCnt in 0 ..< budgetCap:
-        await pushProc()
-
-      let endTime = Moment.now()
-      let elapsed: Duration = (endTime - startTime)
-      await sleepAsync(tokenPeriod - elapsed)
-
-    await restLightPushTest.shutdown()
-
   ## TODO: Re-work this test when lightpush protocol change is done: https://github.com/waku-org/pm/issues/93
   ## This test is similar when no available peer exists for publish. Currently it is returning success,
   ## that makes this test not useful.