From d3bd3f649f8afd913907e24e326c19d760284c92 Mon Sep 17 00:00:00 2001
From: Caio <c410.f3r@gmail.com>
Date: Sat, 1 Aug 2020 13:29:48 -0300
Subject: [PATCH 1/3] Use `default-features = false` where applicable

---
 Cargo.lock         | 493 ++++++++++++---------------------------------
 Cargo.toml         |  40 ++--
 bitswap/Cargo.toml |  23 +--
 http/Cargo.toml    |  56 +++--
 4 files changed, 191 insertions(+), 421 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8545fc5a..11b309b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -132,9 +132,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.31"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f"
+checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b"
 
 [[package]]
 name = "arc-swap"
@@ -170,7 +170,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502"
 dependencies = [
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -180,14 +180,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "efd3d156917d94862e779f356c5acae312b08fd3121e792c857d7928c8088423"
 dependencies = [
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
 ]
 
 [[package]]
 name = "async-channel"
-version = "1.1.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee81ba99bee79f3c8ae114ae4baa7eaa326f63447cf2ec65e4393618b63f8770"
+checksum = "43de69555a39d52918e2bc33a408d3c0a86c829b212d898f4ca25d21a6387478"
 dependencies = [
  "concurrent-queue",
  "event-listener",
@@ -207,7 +207,7 @@ dependencies = [
  "futures-core",
  "futures-io",
  "kv-log-macro",
- "log 0.4.11",
+ "log",
  "memchr",
  "num_cpus",
  "once_cell",
@@ -236,7 +236,7 @@ checksum = "25f9db3b38af870bf7e5cc649167533b493928e50744e2c30ae350230b414670"
 dependencies = [
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -265,7 +265,7 @@ checksum = "a265e3abeffdce30b2e26b7a11b222fe37c6067404001b434101457d0385eb92"
 dependencies = [
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -329,7 +329,7 @@ dependencies = [
  "env_logger",
  "lazy_static",
  "lazycell",
- "log 0.4.11",
+ "log",
  "peeking_take_while",
  "proc-macro2 1.0.19",
  "quote 1.0.7",
@@ -349,7 +349,6 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 name = "bitswap"
 version = "0.1.0"
 dependencies = [
- "anyhow",
  "async-std",
  "async-trait",
  "cid",
@@ -468,16 +467,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb"
 
-[[package]]
-name = "buf_redux"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
-dependencies = [
- "memchr",
- "safemem",
-]
-
 [[package]]
 name = "bumpalo"
 version = "3.4.0"
@@ -636,9 +625,9 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83c06aff61f2d899eb87c379df3cbf7876f14471dcab474e0b6dc90ab96c080"
+checksum = "e296417c8154304ac70aceda41f05318f986f7c0c767bcb0a2366fbb890e78e1"
 dependencies = [
  "cache-padded",
 ]
@@ -793,7 +782,7 @@ dependencies = [
 [[package]]
 name = "dag-cbor"
 version = "0.1.0"
-source = "git+https://github.com/ljedrz/rust-ipld?branch=update_cid#535bddde42b5b1b21b899e9cbaa70e1670fb9122"
+source = "git+https://github.com/ljedrz/rust-ipld?branch=update_cid#97c771b170e8038580cd03b208e1b266bab14965"
 dependencies = [
  "byteorder 1.3.4",
  "libipld-base",
@@ -803,18 +792,18 @@ dependencies = [
 [[package]]
 name = "dag-cbor-derive"
 version = "0.1.0"
-source = "git+https://github.com/ljedrz/rust-ipld?branch=update_cid#535bddde42b5b1b21b899e9cbaa70e1670fb9122"
+source = "git+https://github.com/ljedrz/rust-ipld?branch=update_cid#97c771b170e8038580cd03b208e1b266bab14965"
 dependencies = [
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
  "synstructure",
 ]
 
 [[package]]
 name = "dag-json"
 version = "0.1.0"
-source = "git+https://github.com/ljedrz/rust-ipld?branch=update_cid#535bddde42b5b1b21b899e9cbaa70e1670fb9122"
+source = "git+https://github.com/ljedrz/rust-ipld?branch=update_cid#97c771b170e8038580cd03b208e1b266bab14965"
 dependencies = [
  "base64 0.12.3",
  "libipld-base",
@@ -825,7 +814,7 @@ dependencies = [
 [[package]]
 name = "dag-pb"
 version = "0.1.0"
-source = "git+https://github.com/ljedrz/rust-ipld?branch=update_cid#535bddde42b5b1b21b899e9cbaa70e1670fb9122"
+source = "git+https://github.com/ljedrz/rust-ipld?branch=update_cid#97c771b170e8038580cd03b208e1b266bab14965"
 dependencies = [
  "libipld-base",
  "prost",
@@ -858,7 +847,7 @@ checksum = "8d2d6daefd5f1d4b74a891a5d2ab7dccba028d423107c074232a0c5dc0d40a9e"
 dependencies = [
  "data-encoding",
  "proc-macro-hack",
- "syn 1.0.35",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -997,16 +986,16 @@ checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
 dependencies = [
  "atty",
  "humantime 1.3.0",
- "log 0.4.11",
+ "log",
  "regex",
  "termcolor",
 ]
 
 [[package]]
 name = "event-listener"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "699d84875f1b72b4da017e6b0f77dfa88c0137f089958a88974d15938cbc2976"
+checksum = "298f00c3b04c1d9b4cb86aefaaa35348af0957d98b30a5306fc635f8e718923d"
 
 [[package]]
 name = "fake-simd"
@@ -1022,9 +1011,9 @@ checksum = "36a9cb09840f81cd211e435d00a4e487edd263dc3c8ff815c32dd76ad668ebed"
 
 [[package]]
 name = "filetime"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "affc17579b132fc2461adf7c575cc6e8b134ebca52c51f5411388965227dc695"
+checksum = "e500da2fab70bdc43f8f0e0b350a227f31c72311c56aba48f01d5cd62bb0345b"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1151,9 +1140,9 @@ checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
 
 [[package]]
 name = "futures-lite"
-version = "0.1.8"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180d8fc9819eb48a0c976672fbeea13a73e10999e812bdc9e14644c25ad51d60"
+checksum = "bbe71459749b2e8e66fb95df721b22fa08661ad384a0c5b519e11d3893b4692a"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -1173,7 +1162,7 @@ dependencies = [
  "proc-macro-hack",
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -1253,7 +1242,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60fb4bb6bba52f78a471264d9a3b7d026cc0af47b22cd2cffbc0b787ca003e63"
 dependencies = [
  "typenum",
- "version_check 0.9.2",
+ "version_check",
 ]
 
 [[package]]
@@ -1319,7 +1308,7 @@ dependencies = [
  "indexmap",
  "slab",
  "tokio 0.2.22",
- "tokio-util 0.3.1",
+ "tokio-util",
  "tracing",
 ]
 
@@ -1353,7 +1342,7 @@ dependencies = [
  "bytes 0.5.6",
  "headers-core",
  "http",
- "mime 0.3.16",
+ "mime",
  "sha-1",
  "time",
 ]
@@ -1505,15 +1494,6 @@ dependencies = [
  "hashbrown 0.8.1",
 ]
 
-[[package]]
-name = "input_buffer"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754"
-dependencies = [
- "bytes 0.5.6",
-]
-
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -1563,7 +1543,6 @@ version = "0.1.0"
 dependencies = [
  "async-std",
  "async-stream",
- "base64 0.12.3",
  "bytes 0.5.6",
  "cid",
  "futures 0.3.5",
@@ -1573,13 +1552,12 @@ dependencies = [
  "hyper",
  "ipfs",
  "libipld",
- "mime 0.3.16",
+ "mime",
  "mpart-async",
  "multibase",
  "multihash",
  "openssl",
  "percent-encoding",
- "pin-project",
  "prost",
  "prost-build",
  "serde",
@@ -1643,9 +1621,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.42"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52732a3d3ad72c58ad2dc70624f9c17b46ecd0943b9a4f1ee37c4c18c5d983e2"
+checksum = "85a7e2c92a4804dd459b86c339278d0fe87cf93757fae222c3fa3ae75458bc73"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1672,7 +1650,7 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
 dependencies = [
- "log 0.4.11",
+ "log",
 ]
 
 [[package]]
@@ -1689,14 +1667,14 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 
 [[package]]
 name = "libc"
-version = "0.2.73"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9"
+checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"
 
 [[package]]
 name = "libipld"
 version = "0.1.0"
-source = "git+https://github.com/ljedrz/rust-ipld?branch=update_cid#535bddde42b5b1b21b899e9cbaa70e1670fb9122"
+source = "git+https://github.com/ljedrz/rust-ipld?branch=update_cid#97c771b170e8038580cd03b208e1b266bab14965"
 dependencies = [
  "async-std",
  "async-trait",
@@ -1717,7 +1695,7 @@ dependencies = [
 [[package]]
 name = "libipld-base"
 version = "0.1.0"
-source = "git+https://github.com/ljedrz/rust-ipld?branch=update_cid#535bddde42b5b1b21b899e9cbaa70e1670fb9122"
+source = "git+https://github.com/ljedrz/rust-ipld?branch=update_cid#97c771b170e8038580cd03b208e1b266bab14965"
 dependencies = [
  "cid",
  "multibase",
@@ -1728,7 +1706,7 @@ dependencies = [
 [[package]]
 name = "libipld-macro"
 version = "0.1.0"
-source = "git+https://github.com/ljedrz/rust-ipld?branch=update_cid#535bddde42b5b1b21b899e9cbaa70e1670fb9122"
+source = "git+https://github.com/ljedrz/rust-ipld?branch=update_cid#97c771b170e8038580cd03b208e1b266bab14965"
 dependencies = [
  "libipld-base",
  "multihash",
@@ -1798,7 +1776,7 @@ dependencies = [
  "futures-timer",
  "lazy_static",
  "libsecp256k1",
- "log 0.4.11",
+ "log",
  "multihash",
  "multistream-select",
  "parity-multiaddr",
@@ -1819,12 +1797,12 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core-derive"
-version = "0.20.1"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "515c4a7cba5d321bb88ed3ed803997bdd5634ce35c9c5e8e9ace9c512e57eceb"
+checksum = "f753d9324cd3ec14bf04b8a8cd0d269c87f294153d6bf2a84497a63a5ad22213"
 dependencies = [
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -1846,7 +1824,7 @@ checksum = "f751924b6b98e350005e0b87a822beb246792a3fb878c684e088f866158120ac"
 dependencies = [
  "futures 0.3.5",
  "libp2p-core",
- "log 0.4.11",
+ "log",
 ]
 
 [[package]]
@@ -1880,7 +1858,7 @@ dependencies = [
  "futures_codec",
  "libp2p-core",
  "libp2p-swarm",
- "log 0.4.11",
+ "log",
  "lru",
  "prost",
  "prost-build",
@@ -1900,7 +1878,7 @@ dependencies = [
  "futures 0.3.5",
  "libp2p-core",
  "libp2p-swarm",
- "log 0.4.11",
+ "log",
  "prost",
  "prost-build",
  "smallvec 1.4.1",
@@ -1921,7 +1899,7 @@ dependencies = [
  "futures_codec",
  "libp2p-core",
  "libp2p-swarm",
- "log 0.4.11",
+ "log",
  "multihash",
  "prost",
  "prost-build",
@@ -1948,7 +1926,7 @@ dependencies = [
  "lazy_static",
  "libp2p-core",
  "libp2p-swarm",
- "log 0.4.11",
+ "log",
  "net2",
  "rand 0.7.3",
  "smallvec 1.4.1",
@@ -1967,7 +1945,7 @@ dependencies = [
  "futures 0.3.5",
  "futures_codec",
  "libp2p-core",
- "log 0.4.11",
+ "log",
  "parking_lot 0.10.2",
  "unsigned-varint 0.4.0",
 ]
@@ -1983,7 +1961,7 @@ dependencies = [
  "futures 0.3.5",
  "lazy_static",
  "libp2p-core",
- "log 0.4.11",
+ "log",
  "prost",
  "prost-build",
  "rand 0.7.3",
@@ -2003,7 +1981,7 @@ dependencies = [
  "futures 0.3.5",
  "libp2p-core",
  "libp2p-swarm",
- "log 0.4.11",
+ "log",
  "rand 0.7.3",
  "void",
  "wasm-timer",
@@ -2019,7 +1997,7 @@ dependencies = [
  "futures 0.3.5",
  "futures_codec",
  "libp2p-core",
- "log 0.4.11",
+ "log",
  "prost",
  "prost-build",
  "rw-stream-sink",
@@ -2034,7 +2012,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37d0db10e139d22d7af0b23ed7949449ec86262798aa0fd01595abdbcb02dc87"
 dependencies = [
  "futures 0.3.5",
- "log 0.4.11",
+ "log",
  "pin-project",
  "rand 0.7.3",
  "salsa20",
@@ -2068,7 +2046,7 @@ dependencies = [
  "js-sys",
  "lazy_static",
  "libp2p-core",
- "log 0.4.11",
+ "log",
  "parity-send-wrapper",
  "pin-project",
  "prost",
@@ -2093,7 +2071,7 @@ checksum = "f88d5e2a090a2aadf042cd33484e2f015c6dab212567406a59deece5dedbd133"
 dependencies = [
  "futures 0.3.5",
  "libp2p-core",
- "log 0.4.11",
+ "log",
  "rand 0.7.3",
  "smallvec 1.4.1",
  "void",
@@ -2112,7 +2090,7 @@ dependencies = [
  "get_if_addrs",
  "ipnet",
  "libp2p-core",
- "log 0.4.11",
+ "log",
  "socket2",
 ]
 
@@ -2125,7 +2103,7 @@ dependencies = [
  "async-std",
  "futures 0.3.5",
  "libp2p-core",
- "log 0.4.11",
+ "log",
 ]
 
 [[package]]
@@ -2152,7 +2130,7 @@ dependencies = [
  "either",
  "futures 0.3.5",
  "libp2p-core",
- "log 0.4.11",
+ "log",
  "quicksink",
  "rustls",
  "rw-stream-sink",
@@ -2224,15 +2202,6 @@ dependencies = [
  "scopeguard",
 ]
 
-[[package]]
-name = "log"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-dependencies = [
- "log 0.4.11",
-]
-
 [[package]]
 name = "log"
 version = "0.4.11"
@@ -2287,41 +2256,20 @@ dependencies = [
  "autocfg 1.0.0",
 ]
 
-[[package]]
-name = "mime"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
-dependencies = [
- "log 0.3.9",
-]
-
 [[package]]
 name = "mime"
 version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 
-[[package]]
-name = "mime_guess"
-version = "1.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3"
-dependencies = [
- "mime 0.2.6",
- "phf",
- "phf_codegen",
- "unicase 1.4.2",
-]
-
 [[package]]
 name = "mime_guess"
 version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
 dependencies = [
- "mime 0.3.16",
- "unicase 2.6.0",
+ "mime",
+ "unicase",
 ]
 
 [[package]]
@@ -2345,7 +2293,7 @@ dependencies = [
  "iovec",
  "kernel32-sys",
  "libc",
- "log 0.4.11",
+ "log",
  "miow 0.2.1",
  "net2",
  "slab",
@@ -2358,7 +2306,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
 dependencies = [
- "log 0.4.11",
+ "log",
  "mio",
  "miow 0.3.5",
  "winapi 0.3.9",
@@ -2408,13 +2356,10 @@ dependencies = [
  "futures 0.3.5",
  "http",
  "httparse",
- "log 0.4.11",
- "mime_guess 2.0.3",
+ "log",
  "rand 0.7.3",
  "thiserror",
- "tokio 0.2.22",
- "tokio-util 0.2.0",
- "twoway 0.2.1",
+ "twoway",
 ]
 
 [[package]]
@@ -2449,24 +2394,6 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce"
 
-[[package]]
-name = "multipart"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136eed74cadb9edd2651ffba732b19a450316b680e4f48d6c79e905799e19d01"
-dependencies = [
- "buf_redux",
- "httparse",
- "log 0.4.11",
- "mime 0.2.6",
- "mime_guess 1.8.8",
- "quick-error",
- "rand 0.6.5",
- "safemem",
- "tempfile",
- "twoway 0.1.8",
-]
-
 [[package]]
 name = "multistream-select"
 version = "0.8.2"
@@ -2475,7 +2402,7 @@ checksum = "c9157e87afbc2ef0d84cc0345423d715f445edde00141c93721c162de35a05e5"
 dependencies = [
  "bytes 0.5.6",
  "futures 0.3.5",
- "log 0.4.11",
+ "log",
  "pin-project",
  "smallvec 1.4.1",
  "unsigned-varint 0.4.0",
@@ -2505,7 +2432,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
 dependencies = [
  "memchr",
- "version_check 0.9.2",
+ "version_check",
 ]
 
 [[package]]
@@ -2608,9 +2535,9 @@ checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f"
 
 [[package]]
 name = "parking"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d4a6da31f8144a32532fe38fe8fb439a6842e0ec633f0037f0144c14e7f907"
+checksum = "6cb300f271742d4a2a66c01b6b2fa0c83dfebd2e0bf11addb879a3547b4ed87c"
 
 [[package]]
 name = "parking_lot"
@@ -2684,63 +2611,24 @@ dependencies = [
  "indexmap",
 ]
 
-[[package]]
-name = "phf"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
-dependencies = [
- "phf_shared",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
-dependencies = [
- "phf_generator",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
-dependencies = [
- "phf_shared",
- "rand 0.6.5",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-dependencies = [
- "siphasher",
- "unicase 1.4.2",
-]
-
 [[package]]
 name = "pin-project"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17"
+checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7"
+checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
 dependencies = [
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -2788,35 +2676,33 @@ checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
 
 [[package]]
 name = "proc-macro-error"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
- "version_check 0.9.2",
+ "syn 1.0.36",
+ "version_check",
 ]
 
 [[package]]
 name = "proc-macro-error-attr"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
- "syn-mid",
- "version_check 0.9.2",
+ "version_check",
 ]
 
 [[package]]
 name = "proc-macro-hack"
-version = "0.5.16"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
+checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598"
 
 [[package]]
 name = "proc-macro-nested"
@@ -2861,7 +2747,7 @@ dependencies = [
  "bytes 0.5.6",
  "heck",
  "itertools",
- "log 0.4.11",
+ "log",
  "multimap",
  "petgraph",
  "prost",
@@ -2880,7 +2766,7 @@ dependencies = [
  "itertools",
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -3235,7 +3121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cac94b333ee2aac3284c5b8a1b7fb4dd11cba88c244e3fe33cdbd047af0eb693"
 dependencies = [
  "base64 0.12.3",
- "log 0.4.11",
+ "log",
  "ring",
  "sct",
  "webpki",
@@ -3258,12 +3144,6 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
 
-[[package]]
-name = "safemem"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
-
 [[package]]
 name = "salsa20"
 version = "0.3.0"
@@ -3344,14 +3224,14 @@ checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
 dependencies = [
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.56"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3"
+checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
 dependencies = [
  "itoa",
  "ryu",
@@ -3447,15 +3327,9 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "1.1.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65211b7b6fc3f14ff9fc7a2011a434e3e6880585bd2e9e9396315ae24cbf7852"
-
-[[package]]
-name = "siphasher"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
+checksum = "29f060a7d147e33490ec10da418795238fd7545bba241504d6b31a409f2e6210"
 
 [[package]]
 name = "slab"
@@ -3540,7 +3414,7 @@ dependencies = [
  "flate2",
  "futures 0.3.5",
  "httparse",
- "log 0.4.11",
+ "log",
  "rand 0.7.3",
  "sha-1",
 ]
@@ -3602,7 +3476,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -3630,26 +3504,15 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0"
+checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250"
 dependencies = [
  "proc-macro2 1.0.19",
  "quote 1.0.7",
  "unicode-xid 0.2.1",
 ]
 
-[[package]]
-name = "syn-mid"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
-dependencies = [
- "proc-macro2 1.0.19",
- "quote 1.0.7",
- "syn 1.0.35",
-]
-
 [[package]]
 name = "synstructure"
 version = "0.12.4"
@@ -3658,7 +3521,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
 dependencies = [
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
  "unicode-xid 0.2.1",
 ]
 
@@ -3722,7 +3585,7 @@ checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
 dependencies = [
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -3833,7 +3696,7 @@ checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
 dependencies = [
  "bytes 0.4.12",
  "futures 0.1.29",
- "log 0.4.11",
+ "log",
 ]
 
 [[package]]
@@ -3844,7 +3707,7 @@ checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
 dependencies = [
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
 ]
 
 [[package]]
@@ -3856,7 +3719,7 @@ dependencies = [
  "crossbeam-utils",
  "futures 0.1.29",
  "lazy_static",
- "log 0.4.11",
+ "log",
  "mio",
  "num_cpus",
  "parking_lot 0.9.0",
@@ -3901,7 +3764,7 @@ dependencies = [
  "crossbeam-utils",
  "futures 0.1.29",
  "lazy_static",
- "log 0.4.11",
+ "log",
  "num_cpus",
  "slab",
  "tokio-executor",
@@ -3919,19 +3782,6 @@ dependencies = [
  "tokio-executor",
 ]
 
-[[package]]
-name = "tokio-tungstenite"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8b8fe88007ebc363512449868d7da4389c9400072a3f666f212c7280082882a"
-dependencies = [
- "futures 0.3.5",
- "log 0.4.11",
- "pin-project",
- "tokio 0.2.22",
- "tungstenite",
-]
-
 [[package]]
 name = "tokio-udp"
 version = "0.1.6"
@@ -3940,27 +3790,13 @@ checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82"
 dependencies = [
  "bytes 0.4.12",
  "futures 0.1.29",
- "log 0.4.11",
+ "log",
  "mio",
  "tokio-codec",
  "tokio-io",
  "tokio-reactor",
 ]
 
-[[package]]
-name = "tokio-util"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
-dependencies = [
- "bytes 0.5.6",
- "futures-core",
- "futures-sink",
- "log 0.4.11",
- "pin-project-lite",
- "tokio 0.2.22",
-]
-
 [[package]]
 name = "tokio-util"
 version = "0.3.1"
@@ -3970,7 +3806,7 @@ dependencies = [
  "bytes 0.5.6",
  "futures-core",
  "futures-sink",
- "log 0.4.11",
+ "log",
  "pin-project-lite",
  "tokio 0.2.22",
 ]
@@ -3983,32 +3819,20 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 
 [[package]]
 name = "tracing"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbdf4ccd1652592b01286a5dbe1e2a77d78afaa34beadd9872a5f7396f92aaa9"
+checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178"
 dependencies = [
  "cfg-if",
- "log 0.4.11",
- "tracing-attributes",
+ "log",
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-attributes"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0693bf8d6f2bf22c690fc61a9d21ac69efdbb894a17ed596b9af0f01e64b84b"
-dependencies = [
- "proc-macro2 1.0.19",
- "quote 1.0.7",
- "syn 1.0.35",
-]
-
 [[package]]
 name = "tracing-core"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ae75f0d28ae10786f3b1895c55fe72e79928fd5ccdebb5438c75e93fec178f"
+checksum = "b2734b5a028fa697686f16c6d18c2c6a3c7e41513f9a213abb6754c4acb3c8d7"
 dependencies = [
  "lazy_static",
 ]
@@ -4032,7 +3856,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e0f8c7178e13481ff6765bd169b33e8d554c5d2bbede5e32c356194be02b9b9"
 dependencies = [
  "lazy_static",
- "log 0.4.11",
+ "log",
  "tracing-core",
 ]
 
@@ -4048,9 +3872,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4f5dd7095c2481b7b3cbed71c8de53085fb3542bc3c2b4c73cba43e8f11c7ba"
+checksum = "f7b33f8b2ef2ab0c3778c12646d9c42a24f7772bee4cdafc72199644a9f58fdc"
 dependencies = [
  "ansi_term 0.12.1",
  "chrono",
@@ -4072,25 +3896,6 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
-[[package]]
-name = "tungstenite"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfea31758bf674f990918962e8e5f07071a3161bd7c4138ed23e416e1ac4264e"
-dependencies = [
- "base64 0.11.0",
- "byteorder 1.3.4",
- "bytes 0.5.6",
- "http",
- "httparse",
- "input_buffer",
- "log 0.4.11",
- "rand 0.7.3",
- "sha-1",
- "url",
- "utf-8",
-]
-
 [[package]]
 name = "twofish"
 version = "0.2.0"
@@ -4102,15 +3907,6 @@ dependencies = [
  "opaque-debug 0.2.3",
 ]
 
-[[package]]
-name = "twoway"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "twoway"
 version = "0.2.1"
@@ -4145,22 +3941,13 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c"
 
-[[package]]
-name = "unicase"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
-dependencies = [
- "version_check 0.1.5",
-]
-
 [[package]]
 name = "unicase"
 version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 dependencies = [
- "version_check 0.9.2",
+ "version_check",
 ]
 
 [[package]]
@@ -4260,12 +4047,6 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9232eb53352b4442e40d7900465dfc534e8cb2dc8f18656fcb2ac16112b5593"
 
-[[package]]
-name = "utf-8"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7"
-
 [[package]]
 name = "vcpkg"
 version = "0.2.10"
@@ -4288,12 +4069,6 @@ dependencies = [
  "chrono",
 ]
 
-[[package]]
-name = "version_check"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-
 [[package]]
 name = "version_check"
 version = "0.9.2"
@@ -4318,7 +4093,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 dependencies = [
- "log 0.4.11",
+ "log",
  "try-lock",
 ]
 
@@ -4333,17 +4108,15 @@ dependencies = [
  "headers",
  "http",
  "hyper",
- "log 0.4.11",
- "mime 0.3.16",
- "mime_guess 2.0.3",
- "multipart",
+ "log",
+ "mime",
+ "mime_guess",
  "pin-project",
  "scoped-tls",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "tokio 0.2.22",
- "tokio-tungstenite",
  "tower-service",
  "tracing",
  "tracing-futures",
@@ -4358,9 +4131,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.65"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3edbcc9536ab7eababcc6d2374a0b7bfe13a2b6d562c5e07f370456b1a8f33d"
+checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -4368,24 +4141,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.65"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ed2fb8c84bfad20ea66b26a3743f3e7ba8735a69fe7d95118c33ec8fc1244d"
+checksum = "bc71e4c5efa60fb9e74160e89b93353bc24059999c0ae0fb03affc39770310b0"
 dependencies = [
  "bumpalo",
  "lazy_static",
- "log 0.4.11",
+ "log",
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.15"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ad6e4e8b2b7f8c90b6e09a9b590ea15cb0d1dbe28502b5a405cd95d1981671"
+checksum = "95f8d235a77f880bcef268d379810ea6c0af2eacfa90b1ad5af731776e0c4699"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4395,9 +4168,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.65"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb071268b031a64d92fc6cf691715ca5a40950694d8f683c5bb43db7c730929e"
+checksum = "97c57cefa5fa80e2ba15641578b44d36e7a64279bc5ed43c6dbaf329457a2ed2"
 dependencies = [
  "quote 1.0.7",
  "wasm-bindgen-macro-support",
@@ -4405,22 +4178,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.65"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf592c807080719d1ff2f245a687cbadb3ed28b2077ed7084b47aba8b691f2c6"
+checksum = "841a6d1c35c6f596ccea1f82504a192a60378f64b3bb0261904ad8f2f5657556"
 dependencies = [
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.65"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b6c0220ded549d63860c78c38f3bcc558d1ca3f4efa74942c536ddbbb55e87"
+checksum = "93b162580e34310e5931c4b792560108b10fd14d64915d7fff8ff00180e70092"
 
 [[package]]
 name = "wasm-timer"
@@ -4440,9 +4213,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.42"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be2398f326b7ba09815d0b403095f34dd708579220d099caae89be0b32137b2"
+checksum = "dda38f4e5ca63eda02c059d243aa25b5f35ab98451e518c51612cd0f1bd19a47"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4565,7 +4338,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd37e58a1256a0b328ce9c67d8b62ecdd02f4803ba443df478835cb1a41a637c"
 dependencies = [
  "futures 0.3.5",
- "log 0.4.11",
+ "log",
  "nohash-hasher",
  "parking_lot 0.10.2",
  "rand 0.7.3",
@@ -4589,6 +4362,6 @@ checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
 dependencies = [
  "proc-macro2 1.0.19",
  "quote 1.0.7",
- "syn 1.0.35",
+ "syn 1.0.36",
  "synstructure",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 5cda443c..c558fc33 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,33 +11,33 @@ nightly = []
 all = ["rocksdb"]
 
 [dependencies]
-anyhow = "1.0"
-async-std = { version = "1.6", features = ["attributes", "std"] }
+anyhow = { default-features = false, version = "1.0" }
+async-std = { default-features = false, features = ["attributes", "std"], version = "1.6" }
+async-stream = "0.2"
 async-trait = "0.1"
 bitswap = { path = "bitswap" }
-byteorder = "1.3.4"
+byteorder =  { default-features = false, version = "1.3" }
 cid = "0.5"
 dirs = "3.0"
-domain = { git = "https://github.com/nlnetlabs/domain", rev="084964", features = ["resolv"] }
-futures = { version = "0.3.5", features = ["compat", "io-compat"] }
-libipld = { git = "https://github.com/ljedrz/rust-ipld", branch = "update_cid", features = ["dag-pb", "dag-json"] }
-libp2p = "0.22"
-multibase = "0.8.0"
-multihash = "0.11"
-prost = "0.6.1"
-rand = "0.7.3"
-rocksdb = { version = "0.13.0", optional = true }
-serde = { version = "1.0.106", features = ["derive"] }
-serde_json = "1.0.51"
-thiserror = "1.0.14"
-tracing = { version = "0.1", features = ["log"] }
-tracing-futures = { version = "0.2", default-features = false, features = ["std", "futures-03"] }
-void = "1.0.2"
+domain = { default-features = false, features = ["resolv"], git = "https://github.com/nlnetlabs/domain", rev="084964" }
+futures = { default-features = false, features = ["compat", "io-compat"], version = "0.3.5" }
 ipfs-unixfs = { path = "unixfs" }
-async-stream = "0.2.1"
+libipld = { branch = "update_cid", default-features = false, features = ["dag-pb", "dag-json"], git = "https://github.com/ljedrz/rust-ipld" }
+libp2p = "0.22"
+multibase = "0.8"
+multihash = "0.11"
+prost = { default-features = false, version = "0.6" }
+rand = { default-features = false, features = ["getrandom"], version = "0.7" }
+rocksdb = { default-features = false, optional = true, version = "0.13"}
+serde = { default-features = false, features = ["derive"], version = "1.0" }
+serde_json = { default-features = false, version = "1.0" }
+thiserror = "1.0"
+tracing = { default-features = false, features = ["log"], version = "0.1" }
+tracing-futures = { default-features = false, features = ["std", "futures-03"], version = "0.2" }
+void = { default-features = false, version = "1.0" }
 
 [build-dependencies]
-prost-build = "0.6.1"
+prost-build = "0.6"
 
 [dev-dependencies]
 sha2 = "0.9"
diff --git a/bitswap/Cargo.toml b/bitswap/Cargo.toml
index db278ee6..8dd2d231 100644
--- a/bitswap/Cargo.toml
+++ b/bitswap/Cargo.toml
@@ -5,19 +5,18 @@ authors = ["David Craven <david@craven.ch>"]
 edition = "2018"
 
 [build-dependencies]
-prost-build = "0.6.1"
+prost-build = "0.6"
 
 [dependencies]
-anyhow = "1.0.28"
-async-std = "1.6"
-async-trait = "0.1.29"
-fnv = "1.0.6"
-futures = "0.3.4"
+async-std = { default-features = false, version = "1.6" }
+async-trait = "0.1"
 cid = "0.5"
-libp2p-core = "0.20.0"
-libp2p-swarm = "0.20.0"
+fnv = { default-features = false, version = "1.0" }
+futures = { default-features = false, version = "0.3" }
+libp2p-core = { default-features = false, version = "0.20" }
+libp2p-swarm = "0.20"
 multihash = "0.11"
-prost = "0.6.1"
-thiserror = "1.0.14"
-tracing = { version = "0.1", features = ["log"] }
-unsigned-varint = "0.3.2"
+prost = { default-features = false, version = "0.6" }
+thiserror = "1.0"
+tracing = { default-features = false, version = "0.1" }
+unsigned-varint = { default-features = false, version = "0.3" }
diff --git a/http/Cargo.toml b/http/Cargo.toml
index 6d91c305..853a63c7 100644
--- a/http/Cargo.toml
+++ b/http/Cargo.toml
@@ -6,41 +6,39 @@ edition = "2018"
 build = "build.rs"
 
 [build-dependencies]
-prost-build = "0.6.1"
-vergen = "3.1.0"
+prost-build = "0.6"
+vergen = "3.1"
 
 [dependencies]
-async-std = { default-features = false, features = ["attributes"], version = "1.6" }
-base64 = "0.12.0"
+async-stream = "0.2"
+bytes = { default-features = false, version = "0.5" }
 cid = "0.5"
-futures = "0.3.4"
+futures = { default-features = false, version = "0.3" }
+humantime = "2.0"
+hyper = { default-features = false, version = "0.13" }
 ipfs = { path = "../" }
-libipld = { git = "https://github.com/ljedrz/rust-ipld", branch = "update_cid", features = ["dag-pb", "dag-json"] }
-multibase = "0.8.0"
+libipld = { branch = "update_cid", default-features = false, features = ["dag-pb", "dag-json"], git = "https://github.com/ljedrz/rust-ipld" }
+mime = "0.3"
+mpart-async = { default-features = false, version = "0.4" }
+multibase = "0.8"
 multihash = "0.11"
 # openssl is required for rsa keygen but not used by the rust-ipfs or its dependencies
-openssl = "0.10.30"
-percent-encoding = "2.1.0"
-prost = "0.6.1"
-serde = { version = "1.0.106", features = ["derive"] }
-serde_json = "1.0.51"
-structopt = "0.3.12"
-thiserror = "1.0.14"
-tokio = { version = "0.2.16", features = ["full"] }
-warp = "0.2.3"
-hyper = "0.13.6"
-async-stream = "0.2.1"
-pin-project = "0.4.8"
-url = "2.1.1"
-tar = { version = "0.4.28", default-features = false }
-tracing = { version = "0.1", features = ["log"] }
-tracing-subscriber = { version = "0.2", features = ["fmt", "tracing-log"] }
-bytes = "0.5.4"
-mpart-async = "0.4.1"
-mime = "0.3.16"
-humantime = "2.0.1"
+openssl = "0.10"
+percent-encoding = "2.1"
+prost = { default-features = false, version = "0.6.1" }
+serde = { default-features = false, features = ["derive"], version = "1.0" }
+serde_json = { default-features = false, version = "1.0" }
+structopt = { default-features = false, version = "0.3" }
+tar = { default-features = false, version = "0.4" }
+thiserror = "1.0"
+tokio = { default-features = false, features = ["full"], version = "0.2" }
+tracing = { default-features = false, features = ["log"], version = "0.1" }
+tracing-subscriber = { default-features = false, features = ["fmt", "tracing-log"], version = "0.2" }
+url = "2.1"
+warp = { default-features = false, version = "0.2" }
 
 [dev-dependencies]
-hex = "0.4.2"
+async-std = { default-features = false, features = ["attributes"], version = "1.6" }
+hex = "0.4"
 hex-literal = "0.3"
-tempfile = "3.1.0"
+tempfile = "3.1"

From 94d9b0a35835f570833259c8ae2d1dbc69f25210 Mon Sep 17 00:00:00 2001
From: Caio <c410.f3r@gmail.com>
Date: Sat, 1 Aug 2020 13:44:27 -0300
Subject: [PATCH 2/3] Future-proof unused dependencies

---
 Cargo.lock         | 616 +--------------------------------------------
 Cargo.toml         |  30 +--
 bitswap/Cargo.toml |  16 +-
 http/Cargo.toml    |  36 +--
 4 files changed, 49 insertions(+), 649 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 11b309b6..74c45ed6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,54 +1,15 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "adler"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
-
-[[package]]
-name = "aead"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
-dependencies = [
- "generic-array 0.14.3",
-]
-
-[[package]]
-name = "aes"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7001367fde4c768a19d1029f0a8be5abd9308e1119846d5bd9ad26297b8faf5"
-dependencies = [
- "aes-soft 0.4.0",
- "aesni 0.7.0",
- "block-cipher",
-]
-
 [[package]]
 name = "aes-ctr"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee"
 dependencies = [
- "aes-soft 0.3.3",
- "aesni 0.6.0",
+ "aes-soft",
+ "aesni",
  "ctr",
- "stream-cipher 0.3.2",
-]
-
-[[package]]
-name = "aes-gcm"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f5007801316299f922a6198d1d09a0bae95786815d066d5880d13f7c45ead1"
-dependencies = [
- "aead",
- "aes",
- "block-cipher",
- "ghash",
- "subtle 2.2.3",
+ "stream-cipher",
 ]
 
 [[package]]
@@ -62,17 +23,6 @@ dependencies = [
  "opaque-debug 0.2.3",
 ]
 
-[[package]]
-name = "aes-soft"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4925647ee64e5056cf231608957ce7c81e12d6d6e316b9ce1404778cc1d35fa7"
-dependencies = [
- "block-cipher",
- "byteorder 1.3.4",
- "opaque-debug 0.2.3",
-]
-
 [[package]]
 name = "aesni"
 version = "0.6.0"
@@ -81,26 +31,7 @@ checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100"
 dependencies = [
  "block-cipher-trait",
  "opaque-debug 0.2.3",
- "stream-cipher 0.3.2",
-]
-
-[[package]]
-name = "aesni"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d050d39b0b7688b3a3254394c3e30a9d66c41dcf9b05b0e2dbdc623f6505d264"
-dependencies = [
- "block-cipher",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "ahash"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3"
-dependencies = [
- "const-random",
+ "stream-cipher",
 ]
 
 [[package]]
@@ -121,15 +52,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.32"
@@ -245,18 +167,6 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c17772156ef2829aadc587461c7753af20b7e8db1529bc66855add962a3b35d3"
 
-[[package]]
-name = "async-tls"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df097e3f506bec0e1a24f06bb3c962c228f36671de841ff579cb99f371772634"
-dependencies = [
- "futures 0.3.5",
- "rustls",
- "webpki",
- "webpki-roots 0.19.0",
-]
-
 [[package]]
 name = "async-trait"
 version = "0.1.36"
@@ -364,19 +274,6 @@ dependencies = [
  "unsigned-varint 0.3.3",
 ]
 
-[[package]]
-name = "blake2"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84ce5b6108f8e154604bd4eb76a2f726066c3464d5a552a4229262a18c9bb471"
-dependencies = [
- "byte-tools",
- "byteorder 1.3.4",
- "crypto-mac 0.8.0",
- "digest 0.9.0",
- "opaque-debug 0.2.3",
-]
-
 [[package]]
 name = "blake2b_simd"
 version = "0.5.10"
@@ -420,15 +317,6 @@ dependencies = [
  "generic-array 0.14.3",
 ]
 
-[[package]]
-name = "block-cipher"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa136449e765dc7faa244561ccae839c394048667929af599b5d931ebe7b7f10"
-dependencies = [
- "generic-array 0.14.3",
-]
-
 [[package]]
 name = "block-cipher-trait"
 version = "0.6.2"
@@ -543,29 +431,6 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
-[[package]]
-name = "chacha20"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "086c0f07ac275808b7bf9a39f2fd013aae1498be83632814c8c4e0bd53f2dc58"
-dependencies = [
- "stream-cipher 0.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "chacha20poly1305"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18b0c90556d8e3fec7cf18d84a2f53d27b21288f2fe481b830fadcf809e48205"
-dependencies = [
- "aead",
- "chacha20",
- "poly1305",
- "stream-cipher 0.4.1",
- "zeroize",
-]
-
 [[package]]
 name = "chrono"
 version = "0.4.13"
@@ -605,7 +470,7 @@ version = "2.33.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
 dependencies = [
- "ansi_term 0.11.0",
+ "ansi_term",
  "atty",
  "bitflags",
  "strsim",
@@ -632,26 +497,6 @@ dependencies = [
  "cache-padded",
 ]
 
-[[package]]
-name = "const-random"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f1af9ac737b2dd2d577701e59fd09ba34822f6f2ebdb30a7647405d9e55e16a"
-dependencies = [
- "const-random-macro",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25e4c606eb459dd29f7c57b2e0879f2b6f14ee130918c2b78ccb58a9624e6c7a"
-dependencies = [
- "getrandom",
- "proc-macro-hack",
-]
-
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -664,15 +509,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
 
-[[package]]
-name = "crc32fast"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "crossbeam-deque"
 version = "0.7.3"
@@ -737,23 +573,13 @@ dependencies = [
  "subtle 1.0.0",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
-dependencies = [
- "generic-array 0.14.3",
- "subtle 2.2.3",
-]
-
 [[package]]
 name = "ctr"
 version = "0.3.2"
 source = "git+https://github.com/koivunej/stream-ciphers.git?branch=ctr128-64to128#32000ad390674f0a25f5f85b8964e4a3403ed06a"
 dependencies = [
  "block-cipher-trait",
- "stream-cipher 0.3.2",
+ "stream-cipher",
 ]
 
 [[package]]
@@ -1027,19 +853,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
 
-[[package]]
-name = "flate2"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"
-dependencies = [
- "cfg-if",
- "crc32fast",
- "libc",
- "libz-sys",
- "miniz_oxide",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -1278,15 +1091,6 @@ dependencies = [
  "wasi",
 ]
 
-[[package]]
-name = "ghash"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6e27f0689a6e15944bdce7e45425efb87eaa8ab0c6e87f11d0987a9133e2531"
-dependencies = [
- "polyval",
-]
-
 [[package]]
 name = "glob"
 version = "0.3.0"
@@ -1312,16 +1116,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
-dependencies = [
- "ahash",
- "autocfg 0.1.7",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.8.1"
@@ -1392,7 +1186,7 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695"
 dependencies = [
- "crypto-mac 0.7.0",
+ "crypto-mac",
  "digest 0.8.1",
 ]
 
@@ -1491,7 +1285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7"
 dependencies = [
  "autocfg 1.0.0",
- "hashbrown 0.8.1",
+ "hashbrown",
 ]
 
 [[package]]
@@ -1733,25 +1527,15 @@ dependencies = [
  "lazy_static",
  "libp2p-core",
  "libp2p-core-derive",
- "libp2p-deflate",
- "libp2p-dns",
  "libp2p-floodsub",
- "libp2p-gossipsub",
  "libp2p-identify",
  "libp2p-kad",
  "libp2p-mdns",
  "libp2p-mplex",
- "libp2p-noise",
  "libp2p-ping",
- "libp2p-plaintext",
- "libp2p-pnet",
- "libp2p-request-response",
  "libp2p-secio",
  "libp2p-swarm",
  "libp2p-tcp",
- "libp2p-uds",
- "libp2p-wasm-ext",
- "libp2p-websocket",
  "libp2p-yamux",
  "multihash",
  "parity-multiaddr",
@@ -1805,28 +1589,6 @@ dependencies = [
  "syn 1.0.36",
 ]
 
-[[package]]
-name = "libp2p-deflate"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abeff37fa533fead23fc71b14ed0a2aced36c0c65c3d0078aff07821fb71029e"
-dependencies = [
- "flate2",
- "futures 0.3.5",
- "libp2p-core",
-]
-
-[[package]]
-name = "libp2p-dns"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f751924b6b98e350005e0b87a822beb246792a3fb878c684e088f866158120ac"
-dependencies = [
- "futures 0.3.5",
- "libp2p-core",
- "log",
-]
-
 [[package]]
 name = "libp2p-floodsub"
 version = "0.20.0"
@@ -1844,31 +1606,6 @@ dependencies = [
  "smallvec 1.4.1",
 ]
 
-[[package]]
-name = "libp2p-gossipsub"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a70f76b6c53ae9c97c234498c799802e43f91766bcf4a2a1f94f9339617d713b"
-dependencies = [
- "base64 0.11.0",
- "byteorder 1.3.4",
- "bytes 0.5.6",
- "fnv",
- "futures 0.3.5",
- "futures_codec",
- "libp2p-core",
- "libp2p-swarm",
- "log",
- "lru",
- "prost",
- "prost-build",
- "rand 0.7.3",
- "sha2 0.8.2",
- "smallvec 1.4.1",
- "unsigned-varint 0.4.0",
- "wasm-timer",
-]
-
 [[package]]
 name = "libp2p-identify"
 version = "0.20.0"
@@ -1950,28 +1687,6 @@ dependencies = [
  "unsigned-varint 0.4.0",
 ]
 
-[[package]]
-name = "libp2p-noise"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f353f8966bbaaf7456535fffd3f366f153148773a0cf04b2ec3860955cb720e"
-dependencies = [
- "bytes 0.5.6",
- "curve25519-dalek",
- "futures 0.3.5",
- "lazy_static",
- "libp2p-core",
- "log",
- "prost",
- "prost-build",
- "rand 0.7.3",
- "sha2 0.8.2",
- "snow",
- "static_assertions",
- "x25519-dalek",
- "zeroize",
-]
-
 [[package]]
 name = "libp2p-ping"
 version = "0.20.0"
@@ -1987,52 +1702,6 @@ dependencies = [
  "wasm-timer",
 ]
 
-[[package]]
-name = "libp2p-plaintext"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53f0308a97f6fdd37a2bc388070e471c3ce9d92aa45c99d75c87c2dc5d5cac96"
-dependencies = [
- "bytes 0.5.6",
- "futures 0.3.5",
- "futures_codec",
- "libp2p-core",
- "log",
- "prost",
- "prost-build",
- "rw-stream-sink",
- "unsigned-varint 0.4.0",
- "void",
-]
-
-[[package]]
-name = "libp2p-pnet"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d0db10e139d22d7af0b23ed7949449ec86262798aa0fd01595abdbcb02dc87"
-dependencies = [
- "futures 0.3.5",
- "log",
- "pin-project",
- "rand 0.7.3",
- "salsa20",
- "sha3",
-]
-
-[[package]]
-name = "libp2p-request-response"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f48682b48a96545a323edd150c1d64fc1e250240bba02866e9f902e3dc032a9"
-dependencies = [
- "async-trait",
- "futures 0.3.5",
- "libp2p-core",
- "libp2p-swarm",
- "smallvec 1.4.1",
- "wasm-timer",
-]
-
 [[package]]
 name = "libp2p-secio"
 version = "0.20.0"
@@ -2094,52 +1763,6 @@ dependencies = [
  "socket2",
 ]
 
-[[package]]
-name = "libp2p-uds"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9db9fce9e3588c3118475d9ca761c5c133b639a624a7341e2a61e4b28c376b8"
-dependencies = [
- "async-std",
- "futures 0.3.5",
- "libp2p-core",
- "log",
-]
-
-[[package]]
-name = "libp2p-wasm-ext"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0feb99e32fea20ffb1bbf56a6fb2614bff7325ff44a515728385170b3420d2c3"
-dependencies = [
- "futures 0.3.5",
- "js-sys",
- "libp2p-core",
- "parity-send-wrapper",
- "wasm-bindgen",
- "wasm-bindgen-futures",
-]
-
-[[package]]
-name = "libp2p-websocket"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046a5201f6e471f22b22b394e4d084269ed1e28cf7300f7b49874385db84c7bd"
-dependencies = [
- "async-tls",
- "either",
- "futures 0.3.5",
- "libp2p-core",
- "log",
- "quicksink",
- "rustls",
- "rw-stream-sink",
- "soketto",
- "url",
- "webpki",
- "webpki-roots 0.18.0",
-]
-
 [[package]]
 name = "libp2p-yamux"
 version = "0.20.0"
@@ -2181,18 +1804,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "libz-sys"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "lock_api"
 version = "0.3.4"
@@ -2211,24 +1822,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "lru"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0609345ddee5badacf857d4f547e0e5a2e987db77085c24cd887f73573a04237"
-dependencies = [
- "hashbrown 0.6.3",
-]
-
-[[package]]
-name = "matchers"
-version = "0.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
-dependencies = [
- "regex-automata",
-]
-
 [[package]]
 name = "matches"
 version = "0.1.8"
@@ -2272,15 +1865,6 @@ dependencies = [
  "unicase",
 ]
 
-[[package]]
-name = "miniz_oxide"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "mio"
 version = "0.6.22"
@@ -2649,25 +2233,6 @@ version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
 
-[[package]]
-name = "poly1305"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b42192ab143ed7619bf888a7f9c6733a9a2153b218e2cd557cfdb52fbf9bb1"
-dependencies = [
- "universal-hash",
-]
-
-[[package]]
-name = "polyval"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9a50142b55ab3ed0e9f68dfb3709f1d90d29da24e91033f28b96330643107dc"
-dependencies = [
- "cfg-if",
- "universal-hash",
-]
-
 [[package]]
 name = "ppv-lite86"
 version = "0.2.8"
@@ -3031,16 +2596,6 @@ dependencies = [
  "thread_local",
 ]
 
-[[package]]
-name = "regex-automata"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
-dependencies = [
- "byteorder 1.3.4",
- "regex-syntax",
-]
-
 [[package]]
 name = "regex-syntax"
 version = "0.6.18"
@@ -3064,7 +2619,6 @@ checksum = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4"
 dependencies = [
  "cc",
  "libc",
- "once_cell",
  "spin",
  "untrusted",
  "web-sys",
@@ -3114,19 +2668,6 @@ dependencies = [
  "semver",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cac94b333ee2aac3284c5b8a1b7fb4dd11cba88c244e3fe33cdbd047af0eb693"
-dependencies = [
- "base64 0.12.3",
- "log",
- "ring",
- "sct",
- "webpki",
-]
-
 [[package]]
 name = "rw-stream-sink"
 version = "0.2.1"
@@ -3144,26 +2685,6 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
 
-[[package]]
-name = "salsa20"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2324b0e8c3bb9a586a571fdb3136f70e7e2c748de00a78043f86e0cff91f91fe"
-dependencies = [
- "byteorder 1.3.4",
- "salsa20-core",
- "stream-cipher 0.3.2",
-]
-
-[[package]]
-name = "salsa20-core"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fe6cc1b9f5a5867853ade63099de70f042f7679e408d1ffe52821c9248e6e69"
-dependencies = [
- "stream-cipher 0.3.2",
-]
-
 [[package]]
 name = "scoped-tls"
 version = "1.0.0"
@@ -3176,16 +2697,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
-[[package]]
-name = "sct"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "semver"
 version = "0.9.0"
@@ -3373,24 +2884,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "snow"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32bf8474159a95551661246cda4976e89356999e3cbfef36f493dacc3fae1e8e"
-dependencies = [
- "aes-gcm",
- "blake2",
- "chacha20poly1305",
- "rand 0.7.3",
- "rand_core 0.5.1",
- "ring",
- "rustc_version",
- "sha2 0.9.1",
- "subtle 2.2.3",
- "x25519-dalek",
-]
-
 [[package]]
 name = "socket2"
 version = "0.3.12"
@@ -3403,22 +2896,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "soketto"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85457366ae0c6ce56bf05a958aef14cd38513c236568618edbcd9a8c52cb80b0"
-dependencies = [
- "base64 0.12.3",
- "bytes 0.5.6",
- "flate2",
- "futures 0.3.5",
- "httparse",
- "log",
- "rand 0.7.3",
- "sha-1",
-]
-
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -3440,15 +2917,6 @@ dependencies = [
  "generic-array 0.12.3",
 ]
 
-[[package]]
-name = "stream-cipher"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09f8ed9974042b8c3672ff3030a69fcc03b74c47c3d1ecb7755e8a3626011e88"
-dependencies = [
- "generic-array 0.14.3",
-]
-
 [[package]]
 name = "strsim"
 version = "0.8.0"
@@ -3860,34 +3328,15 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-serde"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6ccba2f8f16e0ed268fc765d9b7ff22e965e7185d32f8f1ec8294fe17d86e79"
-dependencies = [
- "serde",
- "tracing-core",
-]
-
 [[package]]
 name = "tracing-subscriber"
 version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7b33f8b2ef2ab0c3778c12646d9c42a24f7772bee4cdafc72199644a9f58fdc"
 dependencies = [
- "ansi_term 0.12.1",
- "chrono",
- "lazy_static",
- "matchers",
- "regex",
- "serde",
- "serde_json",
  "sharded-slab",
- "smallvec 1.4.1",
  "tracing-core",
  "tracing-log",
- "tracing-serde",
 ]
 
 [[package]]
@@ -3992,16 +3441,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
 
-[[package]]
-name = "universal-hash"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402"
-dependencies = [
- "generic-array 0.14.3",
- "subtle 2.2.3",
-]
-
 [[package]]
 name = "unsigned-varint"
 version = "0.3.3"
@@ -4221,34 +3660,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab146130f5f790d45f82aeeb09e55a256573373ec64409fc19a6fb82fb1032ae"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739"
-dependencies = [
- "webpki",
-]
-
 [[package]]
 name = "wepoll-sys-stjepang"
 version = "1.0.6"
@@ -4320,17 +3731,6 @@ dependencies = [
  "winapi-build",
 ]
 
-[[package]]
-name = "x25519-dalek"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637ff90c9540fa3073bb577e65033069e4bae7c79d49d74aa3ffdf5342a53217"
-dependencies = [
- "curve25519-dalek",
- "rand_core 0.5.1",
- "zeroize",
-]
-
 [[package]]
 name = "yamux"
 version = "0.4.7"
diff --git a/Cargo.toml b/Cargo.toml
index c558fc33..6c579cc9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-name = "ipfs"
-version = "0.1.0"
 authors = ["David Craven <david@craven.ch>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
+name = "ipfs"
+version = "0.1.0"
 
 [features]
 default = []
@@ -13,42 +13,42 @@ all = ["rocksdb"]
 [dependencies]
 anyhow = { default-features = false, version = "1.0" }
 async-std = { default-features = false, features = ["attributes", "std"], version = "1.6" }
-async-stream = "0.2"
-async-trait = "0.1"
+async-stream = { default-features = false, version = "0.2" }
+async-trait = { default-features = false, version = "0.1" }
 bitswap = { path = "bitswap" }
 byteorder =  { default-features = false, version = "1.3" }
-cid = "0.5"
-dirs = "3.0"
+cid = { default-features = false, version = "0.5" }
+dirs = { default-features = false, version = "3.0" }
 domain = { default-features = false, features = ["resolv"], git = "https://github.com/nlnetlabs/domain", rev="084964" }
 futures = { default-features = false, features = ["compat", "io-compat"], version = "0.3.5" }
 ipfs-unixfs = { path = "unixfs" }
 libipld = { branch = "update_cid", default-features = false, features = ["dag-pb", "dag-json"], git = "https://github.com/ljedrz/rust-ipld" }
-libp2p = "0.22"
-multibase = "0.8"
-multihash = "0.11"
+libp2p = { default-features = false, features = ["floodsub", "identify", "kad", "tcp-async-std", "mdns", "mplex", "ping", "secio", "yamux"], version = "0.22" }
+multibase = { default-features = false, version = "0.8" }
+multihash = { default-features = false, version = "0.11" }
 prost = { default-features = false, version = "0.6" }
 rand = { default-features = false, features = ["getrandom"], version = "0.7" }
 rocksdb = { default-features = false, optional = true, version = "0.13"}
 serde = { default-features = false, features = ["derive"], version = "1.0" }
 serde_json = { default-features = false, version = "1.0" }
-thiserror = "1.0"
+thiserror = { default-features = false, version = "1.0" }
 tracing = { default-features = false, features = ["log"], version = "0.1" }
 tracing-futures = { default-features = false, features = ["std", "futures-03"], version = "0.2" }
 void = { default-features = false, version = "1.0" }
 
 [build-dependencies]
-prost-build = "0.6"
+prost-build = { default-features = false, version = "0.6" }
 
 [dev-dependencies]
-sha2 = "0.9"
-hex-literal = "0.3"
-tracing-subscriber = { version = "0.2", features = ["fmt", "tracing-log"] }
+hex-literal = { default-features = false, version = "0.3" }
+sha2 = { default-features = false, version = "0.9" }
+tracing-subscriber = { default-features = false, features = ["fmt", "tracing-log"], version = "0.2" }
 
 [workspace]
 members = [ "bitswap", "http", "unixfs" ]
 
 [patch.crates-io]
-ctr = { git = "https://github.com/koivunej/stream-ciphers.git", branch = "ctr128-64to128" }
+ctr = { branch = "ctr128-64to128", git = "https://github.com/koivunej/stream-ciphers.git" }
 
 # at least these libp2p components need to be patched if you want to use a local version
 # libp2p = { path = "../libp2p" }
diff --git a/bitswap/Cargo.toml b/bitswap/Cargo.toml
index 8dd2d231..e4cd4837 100644
--- a/bitswap/Cargo.toml
+++ b/bitswap/Cargo.toml
@@ -1,22 +1,22 @@
 [package]
-name = "bitswap"
-version = "0.1.0"
 authors = ["David Craven <david@craven.ch>"]
 edition = "2018"
+name = "bitswap"
+version = "0.1.0"
 
 [build-dependencies]
-prost-build = "0.6"
+prost-build = { default-features = false, version = "0.6" }
 
 [dependencies]
 async-std = { default-features = false, version = "1.6" }
-async-trait = "0.1"
-cid = "0.5"
+async-trait = { default-features = false, version = "0.1" }
+cid = { default-features = false, version = "0.5" }
 fnv = { default-features = false, version = "1.0" }
 futures = { default-features = false, version = "0.3" }
 libp2p-core = { default-features = false, version = "0.20" }
-libp2p-swarm = "0.20"
-multihash = "0.11"
+libp2p-swarm = { default-features = false, version = "0.20" }
+multihash = { default-features = false, version = "0.11" }
 prost = { default-features = false, version = "0.6" }
-thiserror = "1.0"
+thiserror = { default-features = false, version = "1.0" }
 tracing = { default-features = false, version = "0.1" }
 unsigned-varint = { default-features = false, version = "0.3" }
diff --git a/http/Cargo.toml b/http/Cargo.toml
index 853a63c7..19ae625a 100644
--- a/http/Cargo.toml
+++ b/http/Cargo.toml
@@ -1,44 +1,44 @@
 [package]
+authors = ["Joonas Koivunen <joonas@equilibrium.co>"]
+build = "build.rs"
+edition = "2018"
 name = "ipfs-http"
 version = "0.1.0"
-authors = ["Joonas Koivunen <joonas@equilibrium.co>"]
-edition = "2018"
-build = "build.rs"
 
 [build-dependencies]
-prost-build = "0.6"
-vergen = "3.1"
+prost-build = { default-features = false, version = "0.6" }
+vergen = { default-features = false, version = "3.1" }
 
 [dependencies]
-async-stream = "0.2"
+async-stream = { default-features = false, version = "0.2" }
 bytes = { default-features = false, version = "0.5" }
-cid = "0.5"
+cid = { default-features = false, version = "0.5" }
 futures = { default-features = false, version = "0.3" }
-humantime = "2.0"
+humantime = { default-features = false, version = "2.0" }
 hyper = { default-features = false, version = "0.13" }
 ipfs = { path = "../" }
 libipld = { branch = "update_cid", default-features = false, features = ["dag-pb", "dag-json"], git = "https://github.com/ljedrz/rust-ipld" }
-mime = "0.3"
+mime = { default-features = false, version = "0.3" }
 mpart-async = { default-features = false, version = "0.4" }
-multibase = "0.8"
-multihash = "0.11"
+multibase = { default-features = false, version = "0.8" }
+multihash = { default-features = false, version = "0.11" }
 # openssl is required for rsa keygen but not used by the rust-ipfs or its dependencies
-openssl = "0.10"
-percent-encoding = "2.1"
+openssl = { default-features = false, version = "0.10" }
+percent-encoding = { default-features = false, version = "2.1" }
 prost = { default-features = false, version = "0.6.1" }
 serde = { default-features = false, features = ["derive"], version = "1.0" }
 serde_json = { default-features = false, version = "1.0" }
 structopt = { default-features = false, version = "0.3" }
 tar = { default-features = false, version = "0.4" }
-thiserror = "1.0"
+thiserror = { default-features = false, version = "1.0" }
 tokio = { default-features = false, features = ["full"], version = "0.2" }
 tracing = { default-features = false, features = ["log"], version = "0.1" }
 tracing-subscriber = { default-features = false, features = ["fmt", "tracing-log"], version = "0.2" }
-url = "2.1"
+url = { default-features = false, version = "2.1" }
 warp = { default-features = false, version = "0.2" }
 
 [dev-dependencies]
 async-std = { default-features = false, features = ["attributes"], version = "1.6" }
-hex = "0.4"
-hex-literal = "0.3"
-tempfile = "3.1"
+hex = { default-features = false, version = "0.4" }
+hex-literal = { default-features = false, version = "0.3" }
+tempfile = { default-features = false, version = "3.1" }

From 15ff8885b2c790ab7cd30f25ef5cab106485004c Mon Sep 17 00:00:00 2001
From: Caio <c410.f3r@gmail.com>
Date: Sat, 1 Aug 2020 14:31:11 -0300
Subject: [PATCH 3/3] Fix android build and include unixfs crate

---
 Cargo.lock        |  4 ++--
 unixfs/Cargo.toml | 29 ++++++++++++++---------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 74c45ed6..b179eae2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -837,9 +837,9 @@ checksum = "36a9cb09840f81cd211e435d00a4e487edd263dc3c8ff815c32dd76ad668ebed"
 
 [[package]]
 name = "filetime"
-version = "0.2.11"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e500da2fab70bdc43f8f0e0b350a227f31c72311c56aba48f01d5cd62bb0345b"
+checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
 dependencies = [
  "cfg-if",
  "libc",
diff --git a/unixfs/Cargo.toml b/unixfs/Cargo.toml
index f34622fc..3708ec85 100644
--- a/unixfs/Cargo.toml
+++ b/unixfs/Cargo.toml
@@ -1,26 +1,25 @@
 [package]
-name = "ipfs-unixfs"
-version = "0.0.1"
 authors = ["Joonas Koivunen <joonas@equilibrium.co>"]
+description = "UnixFs tree support"
 edition = "2018"
 license = "MIT OR Apache-2.0"
-description = "UnixFs tree support"
-repository = "https://github.com/rs-ipfs/rust-ipfs"
+name = "ipfs-unixfs"
 readme = "README.md"
+repository = "https://github.com/rs-ipfs/rust-ipfs"
+version = "0.0.1"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
-default = [ "filetime" ]
+default = ["filetime"]
 
 [dependencies]
-quick-protobuf = "0.7.0"
-cid = "0.5"
-filetime = { version = "0.2.10", optional = true }
-either = "1.5.3"
-sha2 = "0.9"
-multihash = "0.11"
+cid = { default-features = false, version = "0.5" }
+either = { default-features = false, version = "1.5" }
+filetime = { optional = true, version = "=0.2.8" }
+multihash = { default-features = false, version = "0.11" }
+quick-protobuf = { default-features = false, features = ["std"], version = "0.7" }
+sha2 = { default-features = false, version = "0.9" }
 
 [dev-dependencies]
-multibase = "0.8.0"
-hex-literal = "0.3"
-libc = "0.2.71"
+hex-literal = { default-features = false, version = "0.3" }
+libc = { default-features = false, version = "0.2.71" }
+multibase = { default-features = false, version = "0.8.0" }