Bump multiaddr to 0.3 and remove patch in Cargo.toml (#164)

libp2p · Apr 10, 2018 · 342a9f6 · 342a9f6
1 parent 3954f3a
commit 342a9f6
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 13 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,9 +25,6 @@ members = [
 [patch.crates-io]
 # TODO: Update ring and solve conflicts
 "ring" = { git = "https://github.com/briansmith/ring", rev = "3a14ef619559f7d4b69e2286d49c833409eef34a" }
-# Using a local improved version of multiaddr for now
-# TODO: remove once merged upstream
-"multiaddr" = { git = "https://github.com/multiformats/rust-multiaddr" }
 # Using a version of rust-multihash that compiles on emscripten
 # TODO: remove once merged upstream
 "multihash" = { git = "https://github.com/tomaka/rust-multihash", branch = "emscripten-hack" }
diff --git a/dns/Cargo.toml b/dns/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <[email protected]>"]
 libp2p-swarm = { path = "../swarm" }
 log = "0.4.1"
 futures = "0.1"
-multiaddr = "0.2.0"
+multiaddr = "0.3.0"
 tokio-dns-unofficial = "0.1"
 tokio-io = "0.1"
 

diff --git a/example/Cargo.toml b/example/Cargo.toml
@@ -8,7 +8,7 @@ bigint = "4.2"
 bytes = "0.4"
 env_logger = "0.5.4"
 futures = "0.1"
-multiaddr = "0.2"
+multiaddr = "0.3"
 multiplex = { path = "../multiplex-rs" }
 libp2p-identify = { path = "../identify" }
 libp2p-kad = { path = "../kad" }

diff --git a/floodsub/Cargo.toml b/floodsub/Cargo.toml
@@ -12,7 +12,7 @@ futures = "0.1"
 libp2p-peerstore = { path = "../peerstore" }
 libp2p-swarm = { path = "../swarm" }
 log = "0.4.1"
-multiaddr = "0.2"
+multiaddr = "0.3"
 parking_lot = "0.5.3"
 protobuf = "1.4.2"
 smallvec = "0.6.0"

diff --git a/identify/Cargo.toml b/identify/Cargo.toml
@@ -9,7 +9,7 @@ futures = "0.1"
 libp2p-peerstore = { path = "../peerstore" }
 libp2p-swarm = { path = "../swarm" }
 log = "0.4.1"
-multiaddr = "0.2.0"
+multiaddr = "0.3.0"
 protobuf = "1.4.2"
 tokio-io = "0.1.0"
 varint = { path = "../varint-rs" }

diff --git a/kad/Cargo.toml b/kad/Cargo.toml
@@ -15,7 +15,7 @@ libp2p-identify = { path = "../identify" }
 libp2p-peerstore = { path = "../peerstore" }
 libp2p-ping = { path = "../ping" }
 libp2p-swarm = { path = "../swarm" }
-multiaddr = "0.2"
+multiaddr = "0.3"
 parking_lot = "0.5.1"
 protobuf = "1.4.2"
 rand = "0.4.2"

diff --git a/peerstore/Cargo.toml b/peerstore/Cargo.toml
@@ -8,7 +8,7 @@ bs58 = "0.2.0"
 datastore = { path = "../datastore" }
 futures = "0.1.0"
 owning_ref = "0.3.3"
-multiaddr = "0.2"
+multiaddr = "0.3"
 multihash = "0.7.0"
 serde = "1.0"
 serde_derive = "1.0"

diff --git a/ping/Cargo.toml b/ping/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["pierre <[email protected]>"]
 bytes = "0.4"
 libp2p-swarm = { path = "../swarm" }
 log = "0.4.1"
-multiaddr = "0.2.0"
+multiaddr = "0.3.0"
 multistream-select = { path = "../multistream-select" }
 futures = "0.1"
 parking_lot = "0.5"

diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <[email protected]>"]
 bytes = "0.4"
 fnv = "1.0"
 log = "0.4"
-multiaddr = "0.2.0"
+multiaddr = "0.3.0"
 multistream-select = { path = "../multistream-select" }
 futures = { version = "0.1", features = ["use_std"] }
 parking_lot = "0.5.3"

diff --git a/tcp-transport/Cargo.toml b/tcp-transport/Cargo.toml
@@ -7,6 +7,6 @@ authors = ["Parity Technologies <[email protected]>"]
 libp2p-swarm = { path = "../swarm" }
 log = "0.4.1"
 futures = "0.1"
-multiaddr = "0.2.0"
+multiaddr = "0.3.0"
 tokio-core = "0.1"
 tokio-io = "0.1"
diff --git a/websocket/Cargo.toml b/websocket/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Parity Technologies <[email protected]>"]
 [dependencies]
 libp2p-swarm = { path = "../swarm" }
 futures = "0.1"
-multiaddr = "0.2.0"
+multiaddr = "0.3.0"
 log = "0.4.1"
 rw-stream-sink = { path = "../rw-stream-sink" }
 tokio-io = "0.1"