waku-org/nwaku
1
0
Fork 0
mirror of https://github.com/waku-org/nwaku.git synced 2025-02-26 14:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(rpc): return error if peer cant be connected (#1476)

Browse Source
This commit is contained in:
Alvaro Revuelta 2023-01-09 14:15:03 +01:00 committed by GitHub
parent 019f357dc9
commit 333ce0a2e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/v2/test_jsonrpc_waku.nim
View File

@ -389,6 +389,15 @@ procSuite "Waku v2 JSON-RPC API":
getRes.anyIt(it.protocol == WakuRelayCodec and getRes.anyIt(it.protocol == WakuRelayCodec and
it.multiaddr == constructMultiaddrStr(peerInfo3)) it.multiaddr == constructMultiaddrStr(peerInfo3))
# Verify that raises an exception if we can't connect to the peer
let nonExistentPeer = "/ip4/0.0.0.0/tcp/10000/p2p/16Uiu2HAm6HZZr7aToTvEBPpiys4UxajCTU97zj5v7RNR2gbniy1D"
expect(ValueError):
discard await client.post_waku_v2_admin_v1_peers(@[nonExistentPeer])
let malformedPeer = "/malformed/peer"
expect(ValueError):
discard await client.post_waku_v2_admin_v1_peers(@[malformedPeer])
await server.stop() await server.stop()
await server.closeWait() await server.closeWait()

11
waku/v2/node/jsonrpc/admin_api.nim
View File

@ -44,12 +44,11 @@ proc installAdminApiHandlers*(node: WakuNode, rpcsrv: RpcServer) =
## Connect to a list of peers ## Connect to a list of peers
debug "post_waku_v2_admin_v1_peers" debug "post_waku_v2_admin_v1_peers"
if (await node.connectToNodes(peers).withTimeout(futTimeout)): for i, peer in peers:
# Successfully connected to peers let conn = await node.peerManager.dialPeer(parseRemotePeerInfo(peer), WakuRelayCodec, source="rpc")
return true if conn.isNone():
else: raise newException(ValueError, "Failed to connect to peer at index: " & $i & " " & $peer)
# Failed to connect to peers return true
raise newException(ValueError, "Failed to connect to peers: " & $peers)
rpcsrv.rpc("get_waku_v2_admin_v1_peers") do() -> seq[WakuPeer]: rpcsrv.rpc("get_waku_v2_admin_v1_peers") do() -> seq[WakuPeer]:
## Returns a list of peers registered for this node ## Returns a list of peers registered for this node