Move WarpSyncProvider trait and surrounding data structures into `s…

…c-network-common`

client/finality-grandpa/src/warp_proof.rs

@@ -23,7 +23,7 @@ use crate::{
 	BlockNumberOps, GrandpaJustification, SharedAuthoritySet,
 };
 use sc_client_api::Backend as ClientBackend;
-use sc_network_common::warp_sync_provider::{EncodedProof, VerificationResult, WarpSyncProvider};
+use sc_network_common::warp_sync::{EncodedProof, VerificationResult, WarpSyncProvider};
 use sp_blockchain::{Backend as BlockchainBackend, HeaderBackend};
 use sp_finality_grandpa::{AuthorityList, SetId, GRANDPA_ENGINE_ID};
 use sp_runtime::{

client/network/common/src/lib.rs

@@ -21,4 +21,4 @@
 pub mod config;
 pub mod message;
 pub mod request_responses;
-pub mod warp_sync_provider;
+pub mod warp_sync;

client/network/src/config.rs

@@ -26,7 +26,7 @@ pub use sc_network_common::{
 	request_responses::{
 		IncomingRequest, OutgoingResponse, ProtocolConfig as RequestResponseConfig,
 	},
-	warp_sync_provider::WarpSyncProvider,
+	warp_sync::WarpSyncProvider,
 };
 
 pub use libp2p::{build_multiaddr, core::PublicKey, identity};

client/network/src/protocol.rs

@@ -49,7 +49,7 @@ use sc_client_api::{BlockBackend, HeaderBackend, ProofProvider};
 use sc_consensus::import_queue::{BlockImportError, BlockImportStatus, IncomingBlock, Origin};
 use sc_network_common::{
 	config::ProtocolId,
-	warp_sync_provider::{EncodedProof, WarpProofRequest, WarpSyncProvider},
+	warp_sync::{EncodedProof, WarpProofRequest, WarpSyncProvider},
 };
 use sc_network_sync::{
 	message::{

client/network/sync/src/lib.rs

@@ -52,7 +52,7 @@ use libp2p::PeerId;
 use log::{debug, error, info, trace, warn};
 use sc_client_api::{BlockBackend, ProofProvider};
 use sc_consensus::{BlockImportError, BlockImportStatus, IncomingBlock};
-use sc_network_common::warp_sync_provider::{EncodedProof, WarpProofRequest, WarpSyncProvider};
+use sc_network_common::warp_sync::{EncodedProof, WarpProofRequest, WarpSyncProvider};
 use sp_arithmetic::traits::Saturating;
 use sp_blockchain::{Error as ClientError, HeaderBackend, HeaderMetadata};
 use sp_consensus::{

client/network/sync/src/warp.rs

@@ -23,7 +23,7 @@ use crate::{
 	state::{ImportResult, StateSync},
 };
 use sc_client_api::ProofProvider;
-use sc_network_common::warp_sync_provider::{
+use sc_network_common::warp_sync::{
 	EncodedProof, VerificationResult, WarpProofRequest, WarpSyncProvider,
 };
 use sp_blockchain::HeaderBackend;

client/network/sync/src/warp_request_handler.rs

@@ -27,7 +27,7 @@ use sc_network_common::{
 	request_responses::{
 		IncomingRequest, OutgoingResponse, ProtocolConfig as RequestResponseConfig,
 	},
-	warp_sync_provider::{EncodedProof, WarpProofRequest, WarpSyncProvider},
+	warp_sync::{EncodedProof, WarpProofRequest, WarpSyncProvider},
 };
 use sp_runtime::traits::Block as BlockT;
 use std::{sync::Arc, time::Duration};

client/network/test/src/lib.rs

@@ -57,7 +57,7 @@ use sc_network::{
 	warp_request_handler, Multiaddr, NetworkService, NetworkWorker,
 };
 pub use sc_network_common::config::ProtocolId;
-use sc_network_common::warp_sync_provider;
+use sc_network_common::warp_sync;
 use sc_network_light::light_client_requests::handler::LightClientRequestHandler;
 use sc_service::client::Client;
 use sp_blockchain::{
@@ -639,27 +639,26 @@ impl<B: BlockT> VerifierAdapter<B> {
 
 struct TestWarpSyncProvider<B: BlockT>(Arc<dyn HeaderBackend<B>>);
 
-impl<B: BlockT> warp_sync_provider::WarpSyncProvider<B> for TestWarpSyncProvider<B> {
+impl<B: BlockT> warp_sync::WarpSyncProvider<B> for TestWarpSyncProvider<B> {
 	fn generate(
 		&self,
 		_start: B::Hash,
-	) -> Result<warp_sync_provider::EncodedProof, Box<dyn std::error::Error + Send + Sync>> {
+	) -> Result<warp_sync::EncodedProof, Box<dyn std::error::Error + Send + Sync>> {
 		let info = self.0.info();
 		let best_header = self.0.header(BlockId::hash(info.best_hash)).unwrap().unwrap();
-		Ok(warp_sync_provider::EncodedProof(best_header.encode()))
+		Ok(warp_sync::EncodedProof(best_header.encode()))
 	}
 	fn verify(
 		&self,
-		proof: &warp_sync_provider::EncodedProof,
-		_set_id: warp_sync_provider::SetId,
-		_authorities: warp_sync_provider::AuthorityList,
-	) -> Result<warp_sync_provider::VerificationResult<B>, Box<dyn std::error::Error + Send + Sync>>
-	{
-		let warp_sync_provider::EncodedProof(encoded) = proof;
+		proof: &warp_sync::EncodedProof,
+		_set_id: warp_sync::SetId,
+		_authorities: warp_sync::AuthorityList,
+	) -> Result<warp_sync::VerificationResult<B>, Box<dyn std::error::Error + Send + Sync>> {
+		let warp_sync::EncodedProof(encoded) = proof;
 		let header = B::Header::decode(&mut encoded.as_slice()).unwrap();
-		Ok(warp_sync_provider::VerificationResult::Complete(0, Default::default(), header))
+		Ok(warp_sync::VerificationResult::Complete(0, Default::default(), header))
 	}
-	fn current_authorities(&self) -> warp_sync_provider::AuthorityList {
+	fn current_authorities(&self) -> warp_sync::AuthorityList {
 		Default::default()
 	}
 }

client/service/src/builder.rs

@@ -44,7 +44,7 @@ use sc_network::{
 	warp_request_handler::{self, RequestHandler as WarpSyncRequestHandler},
 	NetworkService,
 };
-use sc_network_common::warp_sync_provider::WarpSyncProvider;
+use sc_network_common::warp_sync::WarpSyncProvider;
 use sc_network_light::light_client_requests::{self, handler::LightClientRequestHandler};
 use sc_rpc::{
 	author::AuthorApiServer,