pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 21:41:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update networking code to libp2p 0.14 (#4383)

Browse Source 
* Entirely update substrate-telemetry to futures 0.3

* Add a Closed error

* Update to libp2p 0.14

* More work

* More work

* More work

* More work

* Fix warnings

* Remove unwrap()

* Work on tests fixing

* Fix network tests

* Fix external network tests

* Update libp2p and restore Yamux in discovery test

* Ignore DNS if initializatio nfails

* Restore variables ordering

* Forgot browser-utils

* Fix downfall after merge

* Fix tests
This commit is contained in:
Pierre Krieger
2020-01-09 19:01:23 +01:00
committed by Gavin Wood
parent 6e572a9477
commit ca997cf1e4
29 changed files with 842 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/test/Cargo.toml
+1 -1
View File
@@ -14,7 +14,7 @@ futures = "0.1.29"
futures03 = { package = "futures", version = "0.3.1", features = ["compat"] }
futures-timer = "0.4.0"
rand = "0.7.2"
libp2p = { version = "0.13.2", default-features = false, features = ["libp2p-websocket"] }
libp2p = { version = "0.14.0-alpha.1", default-features = false, features = ["libp2p-websocket"] }
sp-consensus = { version = "0.8", path = "../../../primitives/consensus/common" }
sc-client = { version = "2.0.0", path = "../../" }
sc-client-api = { version = "2.0.0", path = "../../api" }
substrate/client/network/test/src/lib.rs
+5 -2
View File
@@ -22,6 +22,7 @@ mod block_import;
mod sync;
use std::collections::HashMap;
use std::pin::Pin;
use std::sync::Arc;
use libp2p::build_multiaddr;
@@ -48,7 +49,7 @@ use sp_consensus::block_import::{BlockImport, ImportResult};
use sp_consensus::Error as ConsensusError;
use sp_consensus::{BlockOrigin, ForkChoiceStrategy, BlockImportParams, BlockCheckParams, JustificationImport};
use futures::prelude::*;
use futures03::{StreamExt as _, TryStreamExt as _};
use futures03::{Future as _, FutureExt as _, TryFutureExt as _, StreamExt as _, TryStreamExt as _};
use sc_network::{NetworkWorker, NetworkStateInfo, NetworkService, ReportHandle, config::ProtocolId};
use sc_network::config::{NetworkConfiguration, TransportConfig, BoxFinalityProofRequestBuilder};
use libp2p::PeerId;
@@ -713,7 +714,9 @@ pub trait TestNetFactory: Sized {
self.mut_peers(|peers| {
for peer in peers {
trace!(target: "sync", "-- Polling {}", peer.id());
peer.network.poll().unwrap();
futures03::future::poll_fn(|cx| Pin::new(&mut peer.network).poll(cx))
.map(|item| Ok::<_, ()>(item))
.compat().poll().unwrap();
trace!(target: "sync", "-- Polling complete {}", peer.id());
// We poll `imported_blocks_stream`.