Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Apr 10, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion dns/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion floodsub/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion identify/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion kad/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion peerstore/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ping/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion swarm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tcp-transport/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion websocket/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down