tsarevvv/rust-ipfs
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge #290

Browse Source 
290: Some maintenance r=koivunej a=ljedrz

Some maintenance work so as not to conflict too much with the pending PRs:
- depend on cid instead of libipld where only Cid is used
- update the `domain` dep (big `Cargo.lock` wins)

cc #75 

Co-authored-by: ljedrz <ljedrz@gmail.com>
This commit is contained in:
bors[bot] 2020-08-06 13:23:45 +00:00 committed by GitHub
commit b99288b7b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 124 additions and 457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

522
Cargo.lock generated
View File

@ -91,8 +91,8 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502"
dependencies = [
"quote 1.0.7",
"syn 1.0.36",
"quote",
"syn",
]
[[package]]
@ -101,8 +101,8 @@ version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efd3d156917d94862e779f356c5acae312b08fd3121e792c857d7928c8088423"
dependencies = [
"quote 1.0.7",
"syn 1.0.36",
"quote",
"syn",
]
[[package]]
@ -156,9 +156,9 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3548b8efc9f8e8a5a0a2808c5bd8451a9031b9e5b879a79590304ae928b0a70"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
"syn 1.0.36",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -173,9 +173,9 @@ version = "0.1.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a265e3abeffdce30b2e26b7a11b222fe37c6067404001b434101457d0385eb92"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
"syn 1.0.36",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -184,12 +184,6 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
[[package]]
name = "autocfg"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
[[package]]
name = "autocfg"
version = "1.0.0"
@ -447,50 +441,13 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
[[package]]
name = "crossbeam-deque"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
dependencies = [
"crossbeam-epoch",
"crossbeam-utils",
"maybe-uninit",
]
[[package]]
name = "crossbeam-epoch"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
dependencies = [
"autocfg 1.0.0",
"cfg-if",
"crossbeam-utils",
"lazy_static",
"maybe-uninit",
"memoffset",
"scopeguard",
]
[[package]]
name = "crossbeam-queue"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
dependencies = [
"cfg-if",
"crossbeam-utils",
"maybe-uninit",
]
[[package]]
name = "crossbeam-utils"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
dependencies = [
"autocfg 1.0.0",
"autocfg",
"cfg-if",
"lazy_static",
]
@ -558,9 +515,9 @@ name = "dag-cbor-derive"
version = "0.1.0"
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.36",
"proc-macro2",
"quote",
"syn",
"synstructure",
]
@ -611,19 +568,7 @@ checksum = "8d2d6daefd5f1d4b74a891a5d2ab7dccba028d423107c074232a0c5dc0d40a9e"
dependencies = [
"data-encoding",
"proc-macro-hack",
"syn 1.0.36",
]
[[package]]
name = "derive_more"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d944ac6003ed268757ef1ee686753b57efc5fcf0ebe7b64c9fc81e7e32ff839"
dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.13",
"rustc_version",
"syn 0.15.44",
"syn",
]
[[package]]
@ -676,35 +621,27 @@ dependencies = [
[[package]]
name = "domain"
version = "0.4.1"
source = "git+https://github.com/nlnetlabs/domain?rev=084964#08496417cd2315970fdfb43201e619cac5e7a319"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99d25f0ad5b7518bf97b736d4c4a5b6f73239a4dbe0dcc01e47fe1f39eda8249"
dependencies = [
"domain-core",
"domain-resolv",
]
[[package]]
name = "domain-core"
version = "0.4.1"
source = "git+https://github.com/nlnetlabs/domain?rev=084964#08496417cd2315970fdfb43201e619cac5e7a319"
dependencies = [
"bytes 0.4.12",
"chrono",
"derive_more",
"rand 0.6.5",
"unwrap",
"void",
"bytes 0.5.6",
"rand 0.7.3",
"smallvec 1.4.1",
]
[[package]]
name = "domain-resolv"
version = "0.4.1"
source = "git+https://github.com/nlnetlabs/domain?rev=084964#08496417cd2315970fdfb43201e619cac5e7a319"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bff662355e7cd63b1dc1ef063989d6bb3d3e6a9dbf4e72c9e8bb206e9bed5405"
dependencies = [
"domain-core",
"futures 0.1.29",
"rand 0.6.5",
"tokio 0.1.22",
"bytes 0.5.6",
"domain",
"futures 0.3.5",
"rand 0.7.3",
"smallvec 1.4.1",
"tokio",
]
[[package]]
@ -898,9 +835,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
dependencies = [
"proc-macro-hack",
"proc-macro2 1.0.19",
"quote 1.0.7",
"syn 1.0.36",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -1030,7 +967,7 @@ dependencies = [
"http",
"indexmap",
"slab",
"tokio 0.2.22",
"tokio",
"tokio-util",
"tracing",
]
@ -1041,7 +978,7 @@ version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb"
dependencies = [
"autocfg 1.0.0",
"autocfg",
]
[[package]]
@ -1171,7 +1108,7 @@ dependencies = [
"pin-project",
"socket2",
"time",
"tokio 0.2.22",
"tokio",
"tower-service",
"tracing",
"want",
@ -1194,7 +1131,7 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7"
dependencies = [
"autocfg 1.0.0",
"autocfg",
"hashbrown",
]
@ -1217,9 +1154,11 @@ dependencies = [
"async-trait",
"bitswap",
"byteorder 1.3.4",
"bytes 0.5.6",
"cid",
"dirs",
"domain",
"domain-resolv",
"futures 0.3.5",
"hex-literal",
"ipfs-unixfs",
@ -1269,7 +1208,7 @@ dependencies = [
"tar",
"tempfile",
"thiserror",
"tokio 0.2.22",
"tokio",
"tracing",
"tracing-subscriber",
"url",
@ -1469,8 +1408,8 @@ version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f753d9324cd3ec14bf04b8a8cd0d269c87f294153d6bf2a84497a63a5ad22213"
dependencies = [
"quote 1.0.7",
"syn 1.0.36",
"quote",
"syn",
]
[[package]]
@ -1721,15 +1660,6 @@ version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
[[package]]
name = "memoffset"
version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
dependencies = [
"autocfg 1.0.0",
]
[[package]]
name = "mime"
version = "0.3.16"
@ -1896,7 +1826,7 @@ version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
dependencies = [
"autocfg 1.0.0",
"autocfg",
"num-traits",
]
@ -1906,7 +1836,7 @@ version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
dependencies = [
"autocfg 1.0.0",
"autocfg",
]
[[package]]
@ -1957,7 +1887,7 @@ version = "0.9.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
dependencies = [
"autocfg 1.0.0",
"autocfg",
"cc",
"libc",
"pkg-config",
@ -2075,9 +2005,9 @@ version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
"syn 1.0.36",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -2111,9 +2041,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
"proc-macro2 1.0.19",
"quote 1.0.7",
"syn 1.0.36",
"proc-macro2",
"quote",
"syn",
"version_check",
]
@ -2123,8 +2053,8 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
"proc-macro2",
"quote",
"version_check",
]
@ -2140,22 +2070,13 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
[[package]]
name = "proc-macro2"
version = "0.4.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
dependencies = [
"unicode-xid 0.1.0",
]
[[package]]
name = "proc-macro2"
version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
dependencies = [
"unicode-xid 0.2.1",
"unicode-xid",
]
[[package]]
@ -2194,9 +2115,9 @@ checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72"
dependencies = [
"anyhow",
"itertools",
"proc-macro2 1.0.19",
"quote 1.0.7",
"syn 1.0.36",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -2235,22 +2156,13 @@ dependencies = [
"pin-project-lite",
]
[[package]]
name = "quote"
version = "0.6.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
dependencies = [
"proc-macro2 0.4.30",
]
[[package]]
name = "quote"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
dependencies = [
"proc-macro2 1.0.19",
"proc-macro2",
]
[[package]]
@ -2276,25 +2188,6 @@ dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "rand"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
dependencies = [
"autocfg 0.1.7",
"libc",
"rand_chacha 0.1.1",
"rand_core 0.4.2",
"rand_hc 0.1.0",
"rand_isaac",
"rand_jitter",
"rand_os",
"rand_pcg",
"rand_xorshift",
"winapi 0.3.9",
]
[[package]]
name = "rand"
version = "0.7.3"
@ -2303,19 +2196,9 @@ checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
dependencies = [
"getrandom",
"libc",
"rand_chacha 0.2.2",
"rand_chacha",
"rand_core 0.5.1",
"rand_hc 0.2.0",
]
[[package]]
name = "rand_chacha"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
dependencies = [
"autocfg 0.1.7",
"rand_core 0.3.1",
"rand_hc",
]
[[package]]
@ -2352,15 +2235,6 @@ dependencies = [
"getrandom",
]
[[package]]
name = "rand_hc"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
dependencies = [
"rand_core 0.3.1",
]
[[package]]
name = "rand_hc"
version = "0.2.0"
@ -2370,59 +2244,6 @@ dependencies = [
"rand_core 0.5.1",
]
[[package]]
name = "rand_isaac"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
dependencies = [
"rand_core 0.3.1",
]
[[package]]
name = "rand_jitter"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
dependencies = [
"libc",
"rand_core 0.4.2",
"winapi 0.3.9",
]
[[package]]
name = "rand_os"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
dependencies = [
"cloudabi",
"fuchsia-cprng",
"libc",
"rand_core 0.4.2",
"rdrand",
"winapi 0.3.9",
]
[[package]]
name = "rand_pcg"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
dependencies = [
"autocfg 0.1.7",
"rand_core 0.4.2",
]
[[package]]
name = "rand_xorshift"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
dependencies = [
"rand_core 0.3.1",
]
[[package]]
name = "rdrand"
version = "0.4.0"
@ -2592,9 +2413,9 @@ version = "1.0.114"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
"syn 1.0.36",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -2789,9 +2610,9 @@ checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118"
dependencies = [
"heck",
"proc-macro-error",
"proc-macro2 1.0.19",
"quote 1.0.7",
"syn 1.0.36",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -2806,26 +2627,15 @@ version = "2.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1"
[[package]]
name = "syn"
version = "0.15.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.13",
"unicode-xid 0.1.0",
]
[[package]]
name = "syn"
version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
"unicode-xid 0.2.1",
"proc-macro2",
"quote",
"unicode-xid",
]
[[package]]
@ -2834,10 +2644,10 @@ version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
"syn 1.0.36",
"unicode-xid 0.2.1",
"proc-macro2",
"quote",
"syn",
"unicode-xid",
]
[[package]]
@ -2889,9 +2699,9 @@ version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
"syn 1.0.36",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -2919,26 +2729,6 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
[[package]]
name = "tokio"
version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
dependencies = [
"bytes 0.4.12",
"futures 0.1.29",
"mio",
"num_cpus",
"tokio-current-thread",
"tokio-executor",
"tokio-io",
"tokio-reactor",
"tokio-tcp",
"tokio-threadpool",
"tokio-timer",
"tokio-udp",
]
[[package]]
name = "tokio"
version = "0.2.22"
@ -2963,37 +2753,6 @@ dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "tokio-codec"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b"
dependencies = [
"bytes 0.4.12",
"futures 0.1.29",
"tokio-io",
]
[[package]]
name = "tokio-current-thread"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
dependencies = [
"futures 0.1.29",
"tokio-executor",
]
[[package]]
name = "tokio-executor"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
dependencies = [
"crossbeam-utils",
"futures 0.1.29",
]
[[package]]
name = "tokio-io"
version = "0.1.13"
@ -3011,96 +2770,9 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
"syn 1.0.36",
]
[[package]]
name = "tokio-reactor"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
dependencies = [
"crossbeam-utils",
"futures 0.1.29",
"lazy_static",
"log",
"mio",
"num_cpus",
"parking_lot 0.9.0",
"slab",
"tokio-executor",
"tokio-io",
"tokio-sync",
]
[[package]]
name = "tokio-sync"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee"
dependencies = [
"fnv",
"futures 0.1.29",
]
[[package]]
name = "tokio-tcp"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72"
dependencies = [
"bytes 0.4.12",
"futures 0.1.29",
"iovec",
"mio",
"tokio-io",
"tokio-reactor",
]
[[package]]
name = "tokio-threadpool"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
dependencies = [
"crossbeam-deque",
"crossbeam-queue",
"crossbeam-utils",
"futures 0.1.29",
"lazy_static",
"log",
"num_cpus",
"slab",
"tokio-executor",
]
[[package]]
name = "tokio-timer"
version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
dependencies = [
"crossbeam-utils",
"futures 0.1.29",
"slab",
"tokio-executor",
]
[[package]]
name = "tokio-udp"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82"
dependencies = [
"bytes 0.4.12",
"futures 0.1.29",
"log",
"mio",
"tokio-codec",
"tokio-io",
"tokio-reactor",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -3114,7 +2786,7 @@ dependencies = [
"futures-sink",
"log",
"pin-project-lite",
"tokio 0.2.22",
"tokio",
]
[[package]]
@ -3271,12 +2943,6 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
[[package]]
name = "unicode-xid"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
[[package]]
name = "unicode-xid"
version = "0.2.1"
@ -3305,12 +2971,6 @@ version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
[[package]]
name = "unwrap"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e33648dd74328e622c7be51f3b40a303c63f93e6fa5f08778b6203a4c25c20f"
[[package]]
name = "url"
version = "2.1.1"
@ -3391,7 +3051,7 @@ dependencies = [
"serde",
"serde_json",
"serde_urlencoded",
"tokio 0.2.22",
"tokio",
"tower-service",
"tracing",
"tracing-futures",
@ -3423,9 +3083,9 @@ dependencies = [
"bumpalo",
"lazy_static",
"log",
"proc-macro2 1.0.19",
"quote 1.0.7",
"syn 1.0.36",
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-shared",
]
@ -3447,7 +3107,7 @@ version = "0.2.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97c57cefa5fa80e2ba15641578b44d36e7a64279bc5ed43c6dbaf329457a2ed2"
dependencies = [
"quote 1.0.7",
"quote",
"wasm-bindgen-macro-support",
]
@ -3457,9 +3117,9 @@ version = "0.2.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "841a6d1c35c6f596ccea1f82504a192a60378f64b3bb0261904ad8f2f5657556"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
"syn 1.0.36",
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -3587,8 +3247,8 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
dependencies = [
"proc-macro2 1.0.19",
"quote 1.0.7",
"syn 1.0.36",
"proc-macro2",
"quote",
"syn",
"synstructure",
]

4
Cargo.toml
View File

@ -16,9 +16,11 @@ async-stream = { default-features = false, version = "0.3" }
async-trait = { default-features = false, version = "0.1" }
bitswap = { path = "bitswap" }
byteorder = { default-features = false, version = "1.3" }
bytes = { default-features = false, version = "0.5" }
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" }
domain = { default-features = false, version = "0.5" }
domain-resolv = { default-features = false, version = "0.5" }
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" }

2
examples/fetch_and_cat.rs
View File

@ -1,10 +1,10 @@
#![recursion_limit = "512"]
use cid::Cid;
use futures::io::AsyncWriteExt;
use futures::pin_mut;
use futures::stream::StreamExt; // needed for StreamExt::next
use ipfs::{IpfsOptions, TestTypes, UninitializedIpfs};
use libipld::cid::Cid;
use std::convert::TryFrom;
use std::env;
use std::process::exit;

2
examples/ipfs_bitswap_test.rs
View File

@ -1,8 +1,8 @@
#![recursion_limit = "512"]
use async_std::task;
use cid::{Cid, Codec};
use ipfs::{Block, IpfsOptions, TestTypes, UninitializedIpfs};
use libipld::cid::{Cid, Codec};
use multihash::Sha2_256;
fn main() {

2
http/src/v0/block.rs
View File

@ -3,10 +3,10 @@ use crate::v0::support::{
StringSerialized,
};
use bytes::Buf;
use cid::{Cid, Codec, Version};
use futures::stream::{FuturesOrdered, Stream, StreamExt};
use ipfs::error::Error;
use ipfs::{Ipfs, IpfsTypes};
use libipld::cid::{Cid, Codec, Version};
use mime::Mime;
use multihash::Multihash;

3
http/src/v0/refs/path.rs
View File

@ -302,7 +302,8 @@ impl ExactSizeIterator for IpfsPath {
#[cfg(test)]
mod tests {
use super::{IpfsPath, WalkSuccess};
use libipld::{cid::Cid, ipld, Ipld};
use cid::Cid;
use libipld::{ipld, Ipld};
use std::convert::TryFrom;
// good_paths, good_but_unsupported, bad_paths from https://github.com/ipfs/go-path/blob/master/path_test.go

2
http/src/v0/root_files.rs
View File

@ -268,10 +268,10 @@ impl std::error::Error for GetError {
#[cfg(test)]
mod tests {
use cid::Cid;
use futures::stream::{FuturesOrdered, TryStreamExt};
use hex_literal::hex;
use ipfs::{Block, Ipfs, IpfsTypes, Node};
use libipld::cid::Cid;
use multihash::Sha2_256;
use std::convert::TryFrom;
use std::path::PathBuf;

32
src/ipns/dns.rs
View File

@ -1,14 +1,14 @@
use crate::error::Error;
use crate::path::IpfsPath;
use domain::core::iana::Rtype;
use domain::core::rdata::Txt;
use domain::core::{Dname, Question};
use domain::resolv::stub::resolver::Query;
use domain::resolv::{Resolver, StubResolver};
use futures::compat::{Compat01As03, Future01CompatExt};
use bytes::Bytes;
use domain::base::iana::Rtype;
use domain::base::{Dname, Question};
use domain::rdata::rfc1035::Txt;
use domain_resolv::{stub::Answer, StubResolver};
use futures::future::{select_ok, SelectOk};
use futures::pin_mut;
use std::future::Future;
use std::io;
use std::pin::Pin;
use std::str::FromStr;
use std::task::{Context, Poll};
@ -18,8 +18,10 @@ use thiserror::Error;
#[error("no dnslink entry")]
pub struct DnsLinkError;
type FutureAnswer = Pin<Box<dyn Future<Output = Result<Answer, io::Error>>>>;
pub struct DnsLinkFuture {
query: SelectOk<Compat01As03<Query>>,
query: SelectOk<FutureAnswer>,
}
impl Future for DnsLinkFuture {
@ -32,9 +34,9 @@ impl Future for DnsLinkFuture {
pin_mut!(query);
match query.poll(context) {
Poll::Ready(Ok((answer, rest))) => {
for record in answer.answer()?.limit_to::<Txt>() {
for record in answer.answer()?.limit_to::<Txt<_>>() {
let txt = record?;
let bytes = txt.data().text();
let bytes: &[u8] = txt.data().as_flat_slice().unwrap_or(b"");
let string = String::from_utf8_lossy(&bytes).to_string();
if string.starts_with("dnslink=") {
let path = IpfsPath::from_str(&string[8..])?;
@ -57,16 +59,18 @@ impl Future for DnsLinkFuture {
pub async fn resolve(domain: &str) -> Result<IpfsPath, Error> {
let mut dnslink = "_dnslink.".to_string();
dnslink.push_str(domain);
let qname = Dname::from_str(&domain)?;
let qname = Dname::<Bytes>::from_str(&domain)?;
let question = Question::new_in(qname, Rtype::Txt);
let query1 = StubResolver::new().query(question).compat();
let resolver = StubResolver::new();
let query1 = Box::pin(async move { resolver.query(question).await });
let qname = Dname::from_str(&dnslink)?;
let qname = Dname::<Bytes>::from_str(&dnslink)?;
let question = Question::new_in(qname, Rtype::Txt);
let query2 = StubResolver::new().query(question).compat();
let resolver = StubResolver::new();
let query2 = Box::pin(async move { resolver.query(question).await });
Ok(DnsLinkFuture {
query: select_ok(vec![query1, query2]),
query: select_ok(vec![query1 as FutureAnswer, query2]),
}
.await?)
}

2
src/repo/fs.rs
View File

@ -141,7 +141,7 @@ fn block_path(mut base: PathBuf, cid: &Cid) -> PathBuf {
mod tests {
use super::*;
use bitswap::Block;
use libipld::cid::{Cid, Codec};
use cid::{Cid, Codec};
use multihash::Sha2_256;
use std::env::temp_dir;

2
src/repo/mem.rs
View File

@ -150,7 +150,7 @@ impl DataStore for MemDataStore {
mod tests {
use super::*;
use bitswap::Block;
use libipld::cid::{Cid, Codec};
use cid::{Cid, Codec};
use multihash::Sha2_256;
use std::env::temp_dir;

2
src/subscription.rs
View File

@ -6,12 +6,12 @@
use crate::{p2p::ConnectionTarget, RepoEvent};
use async_std::future::Future;
use async_std::task::{self, Context, Poll, Waker};
use cid::Cid;
use core::fmt::Debug;
use core::hash::Hash;
use core::pin::Pin;
use futures::channel::mpsc::Sender;
use futures::lock::Mutex;
use libipld::Cid;
use libp2p::{kad::QueryId, Multiaddr, PeerId};
use std::collections::HashMap;
use std::convert::TryFrom;

2
tests/bitswap_stress_test.rs
View File

@ -1,5 +1,5 @@
use cid::{Cid, Codec};
use ipfs::{Block, Node};
use libipld::cid::{Cid, Codec};
use multihash::Sha2_256;
fn filter(i: usize) -> bool {

2
tests/exchange_block.rs
View File

@ -1,6 +1,6 @@
use async_std::future::timeout;
use cid::{Cid, Codec};
use ipfs::{Block, Node};
use libipld::cid::{Cid, Codec};
use multihash::Sha2_256;
use std::time::Duration;

2
tests/wantlist_and_cancellation.rs
View File

@ -2,10 +2,10 @@ use async_std::{
future::{pending, timeout},
task,
};
use cid::Cid;
use futures::future::{select, Either, FutureExt};
use futures::future::{AbortHandle, Abortable};
use ipfs::Node;
use libipld::Cid;
use std::{
convert::TryFrom,