From 7ff70354fbac0633ec3812f600fd907641da0c3c Mon Sep 17 00:00:00 2001 From: ljedrz Date: Fri, 18 Sep 2020 10:26:58 +0200 Subject: [PATCH 1/3] chore: cargo update Signed-off-by: ljedrz --- Cargo.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index acee78131..1e7b0dab3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -337,9 +337,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" +checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c" [[package]] name = "cfg-if" @@ -732,9 +732,9 @@ dependencies = [ [[package]] name = "either" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "fake-simd" @@ -2272,9 +2272,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91739a34c4355b5434ce54c9086c5895604a9c278586d1f1aa95e04f66b525a0" +checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -3311,18 +3311,18 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8" +checksum = "05f33972566adbd2d3588b0491eb94b98b43695c4ef897903470ede4f3f5a28a" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2" +checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" dependencies = [ "proc-macro2", "quote", From 282932d6024bbcecbf1c0b3314c1dcdafcded613 Mon Sep 17 00:00:00 2001 From: ljedrz Date: Fri, 18 Sep 2020 10:32:36 +0200 Subject: [PATCH 2/3] chore: remove a dead protocol upgrade test Signed-off-by: ljedrz --- bitswap/src/protocol.rs | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/bitswap/src/protocol.rs b/bitswap/src/protocol.rs index 2de67be9d..093413fa8 100644 --- a/bitswap/src/protocol.rs +++ b/bitswap/src/protocol.rs @@ -98,43 +98,3 @@ impl From<()> for MessageWrapper { Self::Tx } } - -#[cfg(test)] -mod tests { - /* - use futures::prelude::*; - use libp2p::core::upgrade; - use super::*; - use tokio::net::{TcpListener, TcpStream}; - - // TODO: rewrite tests with the MemoryTransport - // TODO: figure out why it doesn't exit - #[test] - #[ignore] - fn test_upgrade() { - // yeah this probably did not work before - let listener = TcpListener::bind(&"127.0.0.1:0".parse().unwrap()).unwrap(); - let listener_addr = listener.local_addr().unwrap(); - - let _server = listener - .incoming() - .into_future() - .map_err(|(e, _)| e) - .and_then(|(c, _)| { - println!("upgrading server"); - upgrade::apply_inbound(c.unwrap(), BitswapConfig::default()) - .map_err(|_| panic!()) - }) - .map(|_| ()); - - let _client = TcpStream::connect(&listener_addr) - .and_then(|c| { - println!("upgrading client"); - upgrade::apply_outbound(c, Message::new()) - .map_err(|_| panic!()) - }); - - //tokio::run(server.select(client).map(|_| ()).map_err(|_| panic!())); - } - */ -} From 1be3bb35c886b5c89346631168511a098ab68d6b Mon Sep 17 00:00:00 2001 From: ljedrz Date: Fri, 18 Sep 2020 11:02:04 +0200 Subject: [PATCH 3/3] fix: remove the direct hyper dep from http Signed-off-by: ljedrz --- Cargo.lock | 1 - http/Cargo.toml | 1 - http/src/v0/pin.rs | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1e7b0dab3..62dcca694 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1239,7 +1239,6 @@ dependencies = [ "futures", "hex-literal", "humantime", - "hyper", "ipfs", "mime", "mpart-async", diff --git a/http/Cargo.toml b/http/Cargo.toml index 6335079cb..112b8c413 100644 --- a/http/Cargo.toml +++ b/http/Cargo.toml @@ -16,7 +16,6 @@ bytes = { default-features = false, version = "0.5" } cid = { default-features = false, version = "0.5" } futures = { default-features = false, version = "0.3" } humantime = { default-features = false, version = "2.0" } -hyper = { default-features = false, version = "0.13" } ipfs = { path = "../" } mime = { default-features = false, version = "0.3" } mpart-async = { default-features = false, version = "0.4" } diff --git a/http/src/v0/pin.rs b/http/src/v0/pin.rs index 1ec88363f..c63c24a00 100644 --- a/http/src/v0/pin.rs +++ b/http/src/v0/pin.rs @@ -254,7 +254,7 @@ async fn list_inner( } } -fn format_json_newline(st: St) -> warp::http::Response +fn format_json_newline(st: St) -> warp::http::Response where St: futures::stream::Stream> + Send + 'static, T: Serialize + Send + 'static,