Update libp2p (#559)

This commit is contained in:
Pierre Krieger
2018-08-14 13:14:04 +02:00
committed by Gav Wood
parent b580d38e51
commit 68c1fc0b66
4 changed files with 17 additions and 6 deletions
@@ -22,7 +22,7 @@ rand = "0.5.0"
tokio = "0.1"
tokio-io = "0.1"
tokio-timer = "0.2"
varint = { git = "https://github.com/tomaka/libp2p-rs", branch = "polkadot-2" }
unsigned-varint = { version = "0.1", features = ["codec"] }
[dev-dependencies]
assert_matches = "1.2"
@@ -23,7 +23,7 @@ use std::vec::IntoIter as VecIntoIter;
use futures::{future, Future, stream, Stream, Sink};
use futures::sync::mpsc;
use tokio_io::{AsyncRead, AsyncWrite};
use varint::VarintCodec;
use unsigned_varint::codec::UviBytes;
/// Connection upgrade for a single protocol.
///
@@ -157,7 +157,7 @@ where C: AsyncRead + AsyncWrite + 'static, // TODO: 'static :-/
}
let (sink, stream) = {
let framed = AsyncRead::framed(socket, VarintCodec::default());
let framed = AsyncRead::framed(socket, UviBytes::default());
let msg_rx = msg_rx.map(Message::SendReq)
.map_err(|()| unreachable!("mpsc::UnboundedReceiver never errors"));
let (sink, stream) = framed.split();
@@ -28,7 +28,7 @@ extern crate libc;
extern crate libp2p;
extern crate rand;
extern crate bytes;
extern crate varint;
extern crate unsigned_varint;
extern crate ethcore_io as io;
extern crate ethereum_types;