chore: remove waku swap protocol

waku-org · Mar 31, 2023 · 2b5fd2a · 2b5fd2a
1 parent 67fa736
commit 2b5fd2a
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 621 deletions.
diff --git a/tests/all_tests_v2.nim b/tests/all_tests_v2.nim
@@ -95,11 +95,3 @@ when defined(rln):
     ./v2/waku_rln_relay/test_wakunode_rln_relay,
     ./v2/waku_rln_relay/test_rln_group_manager_onchain,
     ./v2/waku_rln_relay/test_rln_group_manager_static
-
-# Waku swap test suite
-import
-  ./v2/test_waku_swap
-
-# TODO: Only enable this once swap module is integrated more nicely as a dependency, i.e. as submodule with CI etc
-# For PoC execute it manually and run separate module here: https://github.com/vacp2p/swap-contracts-module
-# import ./v2/test_waku_swap_contracts
diff --git a/tests/v2/test_peer_manager.nim b/tests/v2/test_peer_manager.nim
@@ -27,7 +27,6 @@ import
   ../../waku/v2/protocol/waku_filter,
   ../../waku/v2/protocol/waku_lightpush,
   ../../waku/v2/protocol/waku_peer_exchange,
-  ../../waku/v2/protocol/waku_swap/waku_swap,
   ./testlib/common,
   ./testlib/testutils,
   ./testlib/waku2
@@ -97,32 +96,24 @@ procSuite "Peer Manager":
       # Create filter peer
       filterLoc = MultiAddress.init("/ip4/127.0.0.1/tcp/0").tryGet()
       filterPeer = PeerInfo.new(generateEcdsaKey(), @[filterLoc])
-      # Create swap peer
-      swapLoc = MultiAddress.init("/ip4/127.0.0.2/tcp/2").tryGet()
-      swapPeer = PeerInfo.new(generateEcdsaKey(), @[swapLoc])
       # Create store peer
       storeLoc = MultiAddress.init("/ip4/127.0.0.3/tcp/4").tryGet()
       storePeer = PeerInfo.new(generateEcdsaKey(), @[storeLoc])
 
     await node.start()
 
     await node.mountFilterClient()
-    await node.mountSwap()
     node.mountStoreClient()
 
-    node.peerManager.addServicePeer(swapPeer.toRemotePeerInfo(), WakuSwapCodec)
     node.peerManager.addServicePeer(storePeer.toRemotePeerInfo(), WakuStoreCodec)
     node.peerManager.addServicePeer(filterPeer.toRemotePeerInfo(), WakuFilterCodec)
 
     # Check peers were successfully added to peer manager
     check:
-      node.peerManager.peerStore.peers().len == 3
+      node.peerManager.peerStore.peers().len == 2
       node.peerManager.peerStore.peers(WakuFilterCodec).allIt(it.peerId == filterPeer.peerId and
                                                               it.addrs.contains(filterLoc) and
                                                               it.protocols.contains(WakuFilterCodec))
-      node.peerManager.peerStore.peers(WakuSwapCodec).allIt(it.peerId == swapPeer.peerId and
-                                                            it.addrs.contains(swapLoc) and
-                                                            it.protocols.contains(WakuSwapCodec))
       node.peerManager.peerStore.peers(WakuStoreCodec).allIt(it.peerId == storePeer.peerId and
                                                              it.addrs.contains(storeLoc) and
                                                              it.protocols.contains(WakuStoreCodec))

diff --git a/tests/v2/test_waku_swap.nim b/tests/v2/test_waku_swap.nim
diff --git a/tests/v2/test_waku_swap_contracts.nim b/tests/v2/test_waku_swap_contracts.nim
diff --git a/tests/v2/wakunode_jsonrpc/test_jsonrpc_admin.nim b/tests/v2/wakunode_jsonrpc/test_jsonrpc_admin.nim
@@ -154,7 +154,6 @@ procSuite "Waku v2 JSON-RPC API - Admin":
 
     await node.mountFilter()
     await node.mountFilterClient()
-    await node.mountSwap()
     let driver: ArchiveDriver = QueueDriver.new()
     node.mountArchive(some(driver), none(MessageValidator), none(RetentionPolicy))
     await node.mountStore()

diff --git a/waku/v2/node/waku_node.nim b/waku/v2/node/waku_node.nim
@@ -29,7 +29,6 @@ import
   ../protocol/waku_archive,
   ../protocol/waku_store,
   ../protocol/waku_store/client as store_client,
-  ../protocol/waku_swap/waku_swap,
   ../protocol/waku_filter,
   ../protocol/waku_filter/client as filter_client,
   ../protocol/waku_lightpush,
@@ -90,7 +89,6 @@ type
     wakuStoreClient*: WakuStoreClient
     wakuFilter*: WakuFilter
     wakuFilterClient*: WakuFilterClient
-    wakuSwap*: WakuSwap
     when defined(rln):
       wakuRlnRelay*: WakuRLNRelay
     wakuLightPush*: WakuLightPush
@@ -651,21 +649,6 @@ proc unsubscribe*(node: WakuNode, pubsubTopic: PubsubTopic, contentTopics: Conte
   await node.filterUnsubscribe(pubsubTopic, contentTopics, peer=peerOpt.get())
 
 
-## Waku swap
-
-# NOTE: If using the swap protocol, it must be mounted before store. This is
-# because store is using a reference to the swap protocol.
-proc mountSwap*(node: WakuNode, swapConfig: SwapConfig = SwapConfig.init()) {.async, raises: [Defect, LPError].} =
-  info "mounting swap", mode = $swapConfig.mode
-
-  node.wakuSwap = WakuSwap.init(node.peerManager, node.rng, swapConfig)
-  if node.started:
-    # Node has started already. Let's start swap too.
-    await node.wakuSwap.start()
-
-  node.switch.mount(node.wakuSwap, protocolMatcher(WakuSwapCodec))
-
-
 ## Waku archive
 
 proc mountArchive*(node: WakuNode,