Skip to content

Commit 5eb90ba

Browse files
committed
Enhance PeerInfoWithPeers struct and update peer retrieval logic
- Added a new field `total_connected` to the `PeerInfoWithPeers` struct for tracking total connected peers. - Refactored the peer retrieval logic in `get_topology` to extract and include the total connected peers in the results. - Commented out the `peer_scores` field in the `PeerInfo` struct to indicate it is no longer in use.
1 parent f584e3e commit 5eb90ba

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

crates/api/src/route.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ pub struct AppState {
1717
pub struct PeerInfoWithPeers {
1818
#[serde(flatten)]
1919
pub info: PeerInfo,
20+
#[serde(rename = "totalConnected")]
21+
pub total_connected: u64,
2022
#[serde(flatten)]
21-
pub peers: PeerDump,
23+
pub peers: Vec<PeerInfo>,
2224
}
2325

2426
pub async fn list_peers_info(State(state): State<AppState>) -> Json<Vec<PeerInfo>> {
@@ -60,7 +62,13 @@ pub async fn get_topology(State(state): State<AppState>) -> Json<Vec<PeerInfoWit
6062
let mut results = Vec::new();
6163
for handle in handles {
6264
if let Ok((Some(info), Some(peers))) = handle.await {
63-
results.push(PeerInfoWithPeers { info, peers });
65+
let total_connected = peers.total_connected;
66+
let peers = peers.peers.into_iter().map(|(_, v)| v).collect();
67+
results.push(PeerInfoWithPeers {
68+
info,
69+
total_connected,
70+
peers,
71+
});
6472
}
6573
}
6674

crates/rpc-types-optimism/src/p2p.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ pub struct PeerInfo {
3838

3939
#[serde(rename = "gossipBlocks")]
4040
pub gossip_blocks: bool,
41-
42-
#[serde(rename = "scores")]
43-
pub peer_scores: PeerScore,
41+
// #[serde(rename = "scores")]
42+
// pub peer_scores: PeerScore,
4443
}
4544

4645
#[derive(Debug, Clone, Serialize, Deserialize)]

0 commit comments

Comments
 (0)