diff --git a/libp2p/protocols/pubsub/floodsub.nim b/libp2p/protocols/pubsub/floodsub.nim index f98068885c..a5954be3de 100644 --- a/libp2p/protocols/pubsub/floodsub.nim +++ b/libp2p/protocols/pubsub/floodsub.nim @@ -194,7 +194,7 @@ method init*(f: FloodSub) = method publish*( f: FloodSub, topic: string, data: seq[byte] -): Future[int] {.async: (raises: [LPError]).} = +): Future[int] {.async: (raises: []).} = # base returns always 0 discard await procCall PubSub(f).publish(topic, data) diff --git a/libp2p/protocols/pubsub/gossipsub.nim b/libp2p/protocols/pubsub/gossipsub.nim index af6309a1a0..af40cc48b8 100644 --- a/libp2p/protocols/pubsub/gossipsub.nim +++ b/libp2p/protocols/pubsub/gossipsub.nim @@ -705,7 +705,7 @@ method onTopicSubscription*(g: GossipSub, topic: string, subscribed: bool) = method publish*( g: GossipSub, topic: string, data: seq[byte] -): Future[int] {.async: (raises: [LPError]).} = +): Future[int] {.async: (raises: []).} = logScope: topic diff --git a/libp2p/protocols/pubsub/pubsub.nim b/libp2p/protocols/pubsub/pubsub.nim index 6a3b76c08c..eff9b5c2e7 100644 --- a/libp2p/protocols/pubsub/pubsub.nim +++ b/libp2p/protocols/pubsub/pubsub.nim @@ -555,7 +555,7 @@ proc subscribe*(p: PubSub, topic: string, handler: TopicHandler) {.public.} = method publish*( p: PubSub, topic: string, data: seq[byte] -): Future[int] {.base, async: (raises: [LPError]), public.} = +): Future[int] {.base, async: (raises: []), public.} = ## publish to a ``topic`` ## ## The return value is the number of neighbours that we attempted to send the diff --git a/libp2p/protocols/pubsub/rpc/message.nim b/libp2p/protocols/pubsub/rpc/message.nim index 79d1e7984b..5b64900603 100644 --- a/libp2p/protocols/pubsub/rpc/message.nim +++ b/libp2p/protocols/pubsub/rpc/message.nim @@ -65,7 +65,10 @@ proc init*( topic: string, seqno: Option[uint64], sign: bool = true, -): Message {.gcsafe, raises: [LPError].} = +): Message {.gcsafe, raises: [].} = + if sign and peer.isNone(): + doAssert(false, "Cannot sign message without peer info") + var msg = Message(data: data, topic: topic) # order matters, we want to include seqno in the signature @@ -81,9 +84,6 @@ proc init*( .expect("Invalid private key!") .getBytes() .expect("Couldn't get public key bytes!") - else: - if sign: - raise (ref LPError)(msg: "Cannot sign message without peer info") msg