fix: nph

vacp2p · Feb 19, 2025 · 1456bcf · 1456bcf
1 parent 63c2533
commit 1456bcf
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/libp2p/daemon/daemonapi.nim b/libp2p/daemon/daemonapi.nim
@@ -165,7 +165,7 @@ type
   ): Future[bool] {.gcsafe, raises: [CatchableError].}
   P2PPubSubCallback2* = proc(
     api: DaemonAPI, ticket: PubsubTicket, message: PubSubMessage
-  ): Future[bool] {.async:(raises: [CatchableError]).}
+  ): Future[bool] {.async: (raises: [CatchableError]).}
   DaemonError* = object of LPError
   DaemonRemoteError* = object of DaemonError
   DaemonLocalError* = object of DaemonError
@@ -1512,9 +1512,14 @@ proc pubsubSubscribe*(
 
 proc pubsubSubscribe*(
     api: DaemonAPI, topic: string, handler: P2PPubSubCallback
-): Future[PubsubTicket] {.async: (raises: [CatchableError]), deprecated: "Use P2PPubSubCallback2 instead".} =
-  proc wrap(api: DaemonAPI, ticket: PubsubTicket, message: PubSubMessage): Future[bool] {.async:(raises: [CatchableError]).} =
+): Future[PubsubTicket] {.
+    async: (raises: [CatchableError]), deprecated: "Use P2PPubSubCallback2 instead"
+.} =
+  proc wrap(
+      api: DaemonAPI, ticket: PubsubTicket, message: PubSubMessage
+  ): Future[bool] {.async: (raises: [CatchableError]).} =
     await handler(api, ticket, message)
+
   await pubsubSubscribe(api, topic, wrap)
 
 proc shortLog*(pinfo: PeerInfo): string =

diff --git a/libp2p/protocols/pubsub/pubsub.nim b/libp2p/protocols/pubsub/pubsub.nim
@@ -359,7 +359,9 @@ method getOrCreatePeer*(
       peer[].codec = protoNegotiated
     return peer[]
 
-  proc getConn(): Future[Connection] {.async: (raises: [CancelledError, GetConnDialError]).} =
+  proc getConn(): Future[Connection] {.
+      async: (raises: [CancelledError, GetConnDialError])
+  .} =
     try:
       return await p.switch.dial(peerId, protosToDial)
     except CancelledError as exc:

diff --git a/libp2p/protocols/pubsub/pubsubpeer.nim b/libp2p/protocols/pubsub/pubsubpeer.nim
@@ -81,7 +81,8 @@ type
   PubSubPeerEvent* = object
     kind*: PubSubPeerEventKind
 
-  GetConn* = proc(): Future[Connection] {.async: (raises: [CancelledError, GetConnDialError]).}
+  GetConn* =
+    proc(): Future[Connection] {.async: (raises: [CancelledError, GetConnDialError]).}
   DropConn* = proc(peer: PubSubPeer) {.gcsafe, raises: [].}
     # have to pass peer as it's unknown during init
   OnEvent* = proc(peer: PubSubPeer, event: PubSubPeerEvent) {.gcsafe, raises: [].}
@@ -123,9 +124,8 @@ type
       # The max number of elements allowed in the non-priority queue.
     disconnected: bool
 
-  RPCHandler* = proc(peer: PubSubPeer, data: seq[byte]): Future[void] {.
-    async: (raises: [])
-  .}
+  RPCHandler* =
+    proc(peer: PubSubPeer, data: seq[byte]): Future[void] {.async: (raises: []).}
 
 when defined(libp2p_agents_metrics):
   func shortAgent*(p: PubSubPeer): string =

diff --git a/tests/pubsub/utils.nim b/tests/pubsub/utils.nim
@@ -27,8 +27,10 @@ randomize()
 type TestGossipSub* = ref object of GossipSub
 
 proc getPubSubPeer*(p: TestGossipSub, peerId: PeerId): PubSubPeer =
-  proc getConn(): Future[Connection] {.async: (raises: [CancelledError, GetConnDialError]).} =
-    try: 
+  proc getConn(): Future[Connection] {.
+      async: (raises: [CancelledError, GetConnDialError])
+  .} =
+    try:
       return await p.switch.dial(peerId, GossipSubCodec_12)
     except CancelledError as exc:
       raise exc