mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-13 01:11:10 +00:00
Update to libp2p-0.29. (#7341)
* Update to libp2p-0.29. * Update dependencies. * Update Cargo.toml Co-authored-by: Max Inden <mail@max-inden.de> * Fix tests. * Fix tests. * Fix more tests. * Update to 0.29.1 * Update ed25519-dalek dependency of sp-core. * Update Cargo.lock. Co-authored-by: Max Inden <mail@max-inden.de> Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
This commit is contained in:
@@ -29,7 +29,12 @@
|
||||
//!
|
||||
|
||||
use futures::{prelude::*, ready};
|
||||
use libp2p::{core::transport::OptionalTransport, Multiaddr, Transport, wasm_ext};
|
||||
use libp2p::{
|
||||
core::transport::{OptionalTransport, timeout::TransportTimeout},
|
||||
Multiaddr,
|
||||
Transport,
|
||||
wasm_ext
|
||||
};
|
||||
use log::{trace, warn, error};
|
||||
use slog::Drain;
|
||||
use std::{io, pin::Pin, task::Context, task::Poll, time};
|
||||
@@ -58,13 +63,12 @@ pub struct TelemetryWorker {
|
||||
trait StreamAndSink<I>: Stream + Sink<I> {}
|
||||
impl<T: ?Sized + Stream + Sink<I>, I> StreamAndSink<I> for T {}
|
||||
|
||||
type WsTrans = libp2p::core::transport::boxed::Boxed<
|
||||
type WsTrans = libp2p::core::transport::Boxed<
|
||||
Pin<Box<dyn StreamAndSink<
|
||||
Vec<u8>,
|
||||
Item = Result<Vec<u8>, io::Error>,
|
||||
Error = io::Error
|
||||
> + Send>>,
|
||||
io::Error
|
||||
> + Send>>
|
||||
>;
|
||||
|
||||
impl TelemetryWorker {
|
||||
@@ -101,16 +105,15 @@ impl TelemetryWorker {
|
||||
})
|
||||
});
|
||||
|
||||
let transport = transport
|
||||
.timeout(CONNECT_TIMEOUT)
|
||||
.map_err(|err| io::Error::new(io::ErrorKind::Other, err))
|
||||
.map(|out, _| {
|
||||
let transport = TransportTimeout::new(
|
||||
transport.map(|out, _| {
|
||||
let out = out
|
||||
.map_err(|err| io::Error::new(io::ErrorKind::Other, err))
|
||||
.sink_map_err(|err| io::Error::new(io::ErrorKind::Other, err));
|
||||
Box::pin(out) as Pin<Box<_>>
|
||||
})
|
||||
.boxed();
|
||||
}),
|
||||
CONNECT_TIMEOUT
|
||||
).boxed();
|
||||
|
||||
Ok(TelemetryWorker {
|
||||
nodes: endpoints.into_iter().map(|(addr, verbosity)| {
|
||||
|
||||
Reference in New Issue
Block a user