Merge #457

457: Migrate dnslink to trust-dns r=koivunej a=koivunej Ahead next version of libp2p-dns which will finally use trust-dns. Added FIXMEs and more importantly get rid of the windows specific ipconfig, custom future impl around selectok. This shouldn't really affect anything so I doubt this needs to be mentioned in changelog. The IPNS story is quite weak as it is. Co-authored-by: Joonas Koivunen <[email protected]>
rs-ipfs · Feb 9, 2021 · 4bce467 · 4bce467
2 parents 7ae8ff9 + 07458ac
commit 4bce467
Show file tree

Hide file tree

Showing 3 changed files with 176 additions and 134 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,7 +26,7 @@ ipfs-bitswap = { version = "0.1", path = "bitswap" }
 byteorder = { default-features = false, version = "1.3" }
 bytes = { default-features = false, version = "1" }
 cid = { default-features = false, version = "0.5" }
-domain = { default-features = false, git = "https://github.com/NLnetLabs/domain.git", features = ["resolv", "bytes"] }
+trust-dns-resolver = "0.20"
 either = { default-features = false, version = "1.5" }
 futures = { default-features = false, version = "0.3.9", features = ["alloc", "std"] }
 ipfs-unixfs = { version = "0.2", path = "unixfs" }
@@ -47,10 +47,6 @@ fs2 = "0.4.3"
 sled = "0.34"
 once_cell = "1.5.2"
 
-[target.'cfg(windows)'.dependencies]
-# required for DNS resolution
-ipconfig = { default-features = false, version = "0.2" }
-
 [build-dependencies]
 prost-build = { default-features = false, version = "0.7" }