From 977e62b34d5be7a435c42b84a59e7aa2c423812c Mon Sep 17 00:00:00 2001 From: benbierens Date: Sun, 30 Apr 2023 10:03:40 +0200 Subject: [PATCH] Changes switchPeers source from KeyBook to AddressBook (filed ticket in libp2p, discussed with Tanguy) --- codex/rest/api.nim | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/codex/rest/api.nim b/codex/rest/api.nim index 607d2c2a..6069a299 100644 --- a/codex/rest/api.nim +++ b/codex/rest/api.nim @@ -24,6 +24,7 @@ import pkg/stew/base10 import pkg/stew/byteutils import pkg/confutils +import pkg/libp2p import pkg/libp2p/routing_record import pkg/libp2pdht/discv5/spr as spr @@ -50,7 +51,7 @@ proc formatEnginePeers(peers: OrderedTable[PeerId, BlockExcPeerCtx]): JsonNode = for key, value in peers: jarray.add(%* { - "peerId": $(key.data), + "peerId": $key, "context": { "blocks": value.blocks.len, "peerWants": value.peerWants.len, @@ -61,13 +62,13 @@ proc formatEnginePeers(peers: OrderedTable[PeerId, BlockExcPeerCtx]): JsonNode = return jarray -proc formatSwitchPeers(peers: Table[PeerId, crypto.PublicKey]): JsonNode = +proc formatSwitchPeers(peers: Table[PeerId, seq[MultiAddress]]): JsonNode = let jarray = newJArray() for key, value in peers: jarray.add(%* { - "peerId": $(key.data), - "key": $value + "peerId": $key, + "numberOfAddresses": $value.len }) return jarray @@ -272,7 +273,7 @@ proc initRestApi*(node: CodexNodeRef, conf: CodexConf): RestRouter = else: "", "enginePeers": formatEnginePeers(node.engine.peers.peers), - "switchPeers": formatSwitchPeers(node.switch.peerStore[KeyBook].book), + "switchPeers": formatSwitchPeers(node.switch.peerStore[AddressBook].book), "codex": { "version": $codexVersion, "revision": $codexRevision