litep2p: Backport using older pending_get_values

Signed-off-by: Alexandru Vasile <[email protected]>
paritytech · Jan 15, 2025 · e889d18 · e889d18
1 parent 29daf1e
commit e889d18
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 32 deletions.
diff --git a/substrate/client/network/src/litep2p/discovery.rs b/substrate/client/network/src/litep2p/discovery.rs
@@ -33,15 +33,9 @@ use litep2p::{
 		libp2p::{
 			identify::{Config as IdentifyConfig, IdentifyEvent},
 			kademlia::{
-<<<<<<< HEAD
 				Config as KademliaConfig, ConfigBuilder as KademliaConfigBuilder,
-				IncomingRecordValidationMode, KademliaEvent, KademliaHandle, QueryId, Quorum,
-				Record, RecordKey, RecordsType,
-=======
-				Config as KademliaConfig, ConfigBuilder as KademliaConfigBuilder, ContentProvider,
 				IncomingRecordValidationMode, KademliaEvent, KademliaHandle, PeerRecord, QueryId,
 				Quorum, Record, RecordKey,
->>>>>>> 77c78e15 (litep2p: Provide partial results to speedup GetRecord queries (#7099))
 			},
 			ping::{Config as PingConfig, PingEvent},
 		},

diff --git a/substrate/client/network/src/litep2p/mod.rs b/substrate/client/network/src/litep2p/mod.rs
@@ -820,17 +820,8 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkBackend<B, H> for Litep2pNetworkBac
 							self.peerstore_handle.add_known_peer(peer.into());
 						}
 					}
-<<<<<<< HEAD
-					Some(DiscoveryEvent::GetRecordSuccess { query_id, records }) => {
-						match self.pending_get_values.remove(&query_id) {
-							None => log::warn!(
-								target: LOG_TARGET,
-								"`GET_VALUE` succeeded for a non-existent query",
-							),
-							Some((key, started)) => {
-=======
 					Some(DiscoveryEvent::GetRecordPartialResult { query_id, record }) => {
-						if !self.pending_queries.contains_key(&query_id) {
+						if !self.pending_get_values.contains_key(&query_id) {
 							log::error!(
 								target: LOG_TARGET,
 								"Missing/invalid pending query for `GET_VALUE` partial result: {query_id:?}"
@@ -862,33 +853,27 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkBackend<B, H> for Litep2pNetworkBac
 						);
 					}
 					Some(DiscoveryEvent::GetRecordSuccess { query_id }) => {
-						match self.pending_queries.remove(&query_id) {
-							Some(KadQuery::GetValue(key, started)) => {
->>>>>>> 77c78e15 (litep2p: Provide partial results to speedup GetRecord queries (#7099))
+						match self.pending_get_values.remove(&query_id) {
+							Some((key, started)) => {
 								log::trace!(
 									target: LOG_TARGET,
 									"`GET_VALUE` for {key:?} ({query_id:?}) succeeded",
 								);
-<<<<<<< HEAD
-								for record in litep2p_to_libp2p_peer_record(records) {
-									self.event_streams.send(
-										Event::Dht(
-											DhtEvent::ValueFound(
-												record
-											)
-										)
-									);
-								}
-=======
->>>>>>> 77c78e15 (litep2p: Provide partial results to speedup GetRecord queries (#7099))
 
 								if let Some(ref metrics) = self.metrics {
 									metrics
 										.kademlia_query_duration
 										.with_label_values(&["value-get"])
 										.observe(started.elapsed().as_secs_f64());
 								}
-							}
+							},
+							None => {
+								log::error!(
+									target: LOG_TARGET,
+									"Missing/invalid pending query for `GET_VALUE`: {query_id:?}"
+								);
+								debug_assert!(false);
+							},
 						}
 					}
 					Some(DiscoveryEvent::PutRecordSuccess { query_id }) => {