Address review feedback

Signed-off-by: Alexandru Gheorghe <[email protected]>
paritytech · May 12, 2024 · 3313fd7 · 3313fd7
1 parent 17df838
commit 3313fd7
Showing 1 changed file with 44 additions and 37 deletions.
diff --git a/substrate/client/network/src/litep2p/mod.rs b/substrate/client/network/src/litep2p/mod.rs
@@ -57,7 +57,10 @@ use litep2p::{
 	crypto::ed25519::{Keypair, SecretKey},
 	executor::Executor,
 	protocol::{
-		libp2p::{bitswap::Config as BitswapConfig, kademlia::QueryId},
+		libp2p::{
+			bitswap::Config as BitswapConfig,
+			kademlia::{QueryId, RecordsType},
+		},
 		request_response::ConfigBuilder as RequestResponseConfigBuilder,
 	},
 	transport::{
@@ -813,42 +816,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkBackend<B, H> for Litep2pNetworkBac
 									"`GET_VALUE` for {:?} ({query_id:?}) succeeded",
 									key,
 								);
-								let received_records = match records {
-									litep2p::protocol::libp2p::kademlia::RecordsType::LocalStore(record) => {
-										vec![
-											PeerRecord {
-												record: Record {
-													key: record.key.to_vec().into(),
-													value: record.value,
-													publisher: record.publisher.map(|peer_id| {
-														let peer_id: sc_network_types::PeerId = peer_id.into();
-														peer_id.into()
-													}),
-													expires: record.expires,
-												},
-												peer: None,
-											}
-										]
-									},
-									litep2p::protocol::libp2p::kademlia::RecordsType::Network(records) => records.into_iter().map(|record| {
-										let peer_id: sc_network_types::PeerId = record.peer.into();
-
-										PeerRecord {
-											record: Record {
-												key: record.record.key.to_vec().into(),
-												value: record.record.value,
-												publisher: record.record.publisher.map(|peer_id| {
-													let peer_id: sc_network_types::PeerId = peer_id.into();
-													peer_id.into()
-												}),
-												expires: record.record.expires,
-											},
-										peer: Some(peer_id.into()),
-										}
-									}).collect::<Vec<_>>(),
-								};
-
-								for record in received_records {
+								for record in litep2p_to_libp2p_peer_record(records) {
 									self.event_streams.send(
 										Event::Dht(
 											DhtEvent::ValueFound(
@@ -1032,3 +1000,42 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkBackend<B, H> for Litep2pNetworkBac
 		}
 	}
 }
+
+// Glue code to convert from a litep2p records type to a libp2p2 PeerRecord.
+fn litep2p_to_libp2p_peer_record(records: RecordsType) -> Vec<PeerRecord> {
+	match records {
+		litep2p::protocol::libp2p::kademlia::RecordsType::LocalStore(record) => {
+			vec![PeerRecord {
+				record: Record {
+					key: record.key.to_vec().into(),
+					value: record.value,
+					publisher: record.publisher.map(|peer_id| {
+						let peer_id: sc_network_types::PeerId = peer_id.into();
+						peer_id.into()
+					}),
+					expires: record.expires,
+				},
+				peer: None,
+			}]
+		},
+		litep2p::protocol::libp2p::kademlia::RecordsType::Network(records) => records
+			.into_iter()
+			.map(|record| {
+				let peer_id: sc_network_types::PeerId = record.peer.into();
+
+				PeerRecord {
+					record: Record {
+						key: record.record.key.to_vec().into(),
+						value: record.record.value,
+						publisher: record.record.publisher.map(|peer_id| {
+							let peer_id: sc_network_types::PeerId = peer_id.into();
+							peer_id.into()
+						}),
+						expires: record.record.expires,
+					},
+					peer: Some(peer_id.into()),
+				}
+			})
+			.collect::<Vec<_>>(),
+	}
+}