mirror of
https://github.com/logos-messaging/logos-messaging-nim.git
synced 2026-01-07 16:33:08 +00:00
simplify libwaku error returns (#3399)
This commit is contained in:
parent
3464d81a6f
commit
924cc9341a
@ -143,7 +143,7 @@ proc process*(
|
|||||||
of PEER_EXCHANGE:
|
of PEER_EXCHANGE:
|
||||||
let numValidPeers = (await performPeerExchangeRequestTo(self[].numPeers, waku)).valueOr:
|
let numValidPeers = (await performPeerExchangeRequestTo(self[].numPeers, waku)).valueOr:
|
||||||
error "PEER_EXCHANGE failed", error = error
|
error "PEER_EXCHANGE failed", error = error
|
||||||
return err("error calling performPeerExchangeRequestTo: " & $error)
|
return err($error)
|
||||||
return ok($numValidPeers)
|
return ok($numValidPeers)
|
||||||
|
|
||||||
error "discovery request not handled"
|
error "discovery request not handled"
|
||||||
|
|||||||
@ -92,16 +92,16 @@ proc process*(
|
|||||||
of CREATE_NODE:
|
of CREATE_NODE:
|
||||||
waku[] = (await createWaku(self.configJson, self.appCallbacks)).valueOr:
|
waku[] = (await createWaku(self.configJson, self.appCallbacks)).valueOr:
|
||||||
error "CREATE_NODE failed", error = error
|
error "CREATE_NODE failed", error = error
|
||||||
return err("error processing createWaku request: " & $error)
|
return err($error)
|
||||||
of START_NODE:
|
of START_NODE:
|
||||||
(await waku.startWaku()).isOkOr:
|
(await waku.startWaku()).isOkOr:
|
||||||
error "START_NODE failed", error = error
|
error "START_NODE failed", error = error
|
||||||
return err("problem starting waku: " & $error)
|
return err($error)
|
||||||
of STOP_NODE:
|
of STOP_NODE:
|
||||||
try:
|
try:
|
||||||
await waku[].stop()
|
await waku[].stop()
|
||||||
except Exception:
|
except Exception:
|
||||||
error "STOP_NODE failed", error = getCurrentExceptionMsg()
|
error "STOP_NODE failed", error = getCurrentExceptionMsg()
|
||||||
return err("exception stopping node: " & getCurrentExceptionMsg())
|
return err(getCurrentExceptionMsg())
|
||||||
|
|
||||||
return ok("")
|
return ok("")
|
||||||
|
|||||||
@ -104,6 +104,6 @@ proc process*(
|
|||||||
)
|
)
|
||||||
).valueOr:
|
).valueOr:
|
||||||
error "PUBLISH failed", error = error
|
error "PUBLISH failed", error = error
|
||||||
return err("LightpushRequest error publishing: " & $error)
|
return err($error)
|
||||||
|
|
||||||
return ok(msgHashHex)
|
return ok(msgHashHex)
|
||||||
|
|||||||
@ -113,28 +113,25 @@ proc process*(
|
|||||||
(kind: SubscriptionKind.PubsubSub, topic: $self.pubsubTopic),
|
(kind: SubscriptionKind.PubsubSub, topic: $self.pubsubTopic),
|
||||||
handler = some(self.relayEventCallback),
|
handler = some(self.relayEventCallback),
|
||||||
).isOkOr:
|
).isOkOr:
|
||||||
let errorMsg = "Subscribe failed:" & $error
|
error "SUBSCRIBE failed", error
|
||||||
error "SUBSCRIBE failed", error = errorMsg
|
return err($error)
|
||||||
return err(errorMsg)
|
|
||||||
of UNSUBSCRIBE:
|
of UNSUBSCRIBE:
|
||||||
waku.node.unsubscribe((kind: SubscriptionKind.PubsubSub, topic: $self.pubsubTopic)).isOkOr:
|
waku.node.unsubscribe((kind: SubscriptionKind.PubsubSub, topic: $self.pubsubTopic)).isOkOr:
|
||||||
let errorMsg = "Unsubscribe failed:" & $error
|
error "UNSUBSCRIBE failed", error
|
||||||
error "UNSUBSCRIBE failed", error = errorMsg
|
return err($error)
|
||||||
return err(errorMsg)
|
|
||||||
of PUBLISH:
|
of PUBLISH:
|
||||||
let msg = self.message.toWakuMessage()
|
let msg = self.message.toWakuMessage()
|
||||||
let pubsubTopic = $self.pubsubTopic
|
let pubsubTopic = $self.pubsubTopic
|
||||||
|
|
||||||
(await waku.node.wakuRelay.publish(pubsubTopic, msg)).isOkOr:
|
(await waku.node.wakuRelay.publish(pubsubTopic, msg)).isOkOr:
|
||||||
let errorMsg = "Message not sent." & $error
|
error "PUBLISH failed", error
|
||||||
error "PUBLISH failed", error = errorMsg
|
return err($error)
|
||||||
return err(errorMsg)
|
|
||||||
|
|
||||||
let msgHash = computeMessageHash(pubSubTopic, msg).to0xHex
|
let msgHash = computeMessageHash(pubSubTopic, msg).to0xHex
|
||||||
return ok(msgHash)
|
return ok(msgHash)
|
||||||
of NUM_CONNECTED_PEERS:
|
of NUM_CONNECTED_PEERS:
|
||||||
let numConnPeers = waku.node.wakuRelay.getNumConnectedPeers($self.pubsubTopic).valueOr:
|
let numConnPeers = waku.node.wakuRelay.getNumConnectedPeers($self.pubsubTopic).valueOr:
|
||||||
error "NUM_CONNECTED_PEERS failed", error = error
|
error "NUM_CONNECTED_PEERS failed", error
|
||||||
return err($error)
|
return err($error)
|
||||||
return ok($numConnPeers)
|
return ok($numConnPeers)
|
||||||
of LIST_CONNECTED_PEERS:
|
of LIST_CONNECTED_PEERS:
|
||||||
@ -164,5 +161,5 @@ proc process*(
|
|||||||
@[protectedShard], uint16(self.clusterId)
|
@[protectedShard], uint16(self.clusterId)
|
||||||
)
|
)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
return err("ADD_PROTECTED_SHARD exception: " & getCurrentExceptionMsg())
|
return err(getCurrentExceptionMsg())
|
||||||
return ok("")
|
return ok("")
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user