From 95ebee5841ee3614668d82ee7fee1aeddd38fe5b Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Tue, 27 Nov 2018 10:35:47 +0100 Subject: [PATCH] Update some dependencies (#686) * Update many dependencies * Upgrade some secio deps --- Cargo.toml | 4 ++-- core/Cargo.toml | 4 ++-- misc/mdns/Cargo.toml | 2 +- misc/multiaddr/Cargo.toml | 4 ++-- misc/multihash/Cargo.toml | 6 +++--- misc/peer-id-generator/Cargo.toml | 2 +- muxers/mplex/Cargo.toml | 2 +- muxers/yamux/Cargo.toml | 2 +- protocols/floodsub/Cargo.toml | 2 +- protocols/identify/Cargo.toml | 2 +- protocols/kad/Cargo.toml | 5 ++--- protocols/ping/Cargo.toml | 4 ++-- protocols/secio/Cargo.toml | 4 ++-- protocols/secio/src/lib.rs | 2 +- transports/dns/Cargo.toml | 2 +- transports/relay/Cargo.toml | 2 +- 16 files changed, 24 insertions(+), 25 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d3c0b455..d68027ce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,8 +43,8 @@ libp2p-tcp-transport = { path = "./transports/tcp" } stdweb = { version = "0.1.3", default-features = false } [dev-dependencies] -env_logger = "0.5.4" -rand = "0.5" +env_logger = "0.6.0" +rand = "0.6" tokio = "0.1" tokio-stdin-stdout = "0.1" diff --git a/core/Cargo.toml b/core/Cargo.toml index f01edae9..d0885e40 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -13,7 +13,7 @@ multiaddr = { path = "../misc/multiaddr" } multihash = { path = "../misc/multihash" } multistream-select = { path = "../misc/multistream-select" } futures = { version = "0.1", features = ["use_std"] } -parking_lot = "0.6" +parking_lot = "0.7" protobuf = "2.0.2" quick-error = "1.2" rw-stream-sink = { path = "../misc/rw-stream-sink" } @@ -27,7 +27,7 @@ void = "1" libp2p-ping = { path = "../protocols/ping" } libp2p-tcp-transport = { path = "../transports/tcp" } libp2p-mplex = { path = "../muxers/mplex" } -rand = "0.5" +rand = "0.6" tokio = "0.1" tokio-codec = "0.1" tokio-timer = "0.2" diff --git a/misc/mdns/Cargo.toml b/misc/mdns/Cargo.toml index 48307189..3d09c579 100644 --- a/misc/mdns/Cargo.toml +++ b/misc/mdns/Cargo.toml @@ -12,7 +12,7 @@ futures = "0.1" libp2p-core = { path = "../../core" } multiaddr = { path = "../multiaddr" } net2 = "0.2" -rand = "0.5" +rand = "0.6" tokio-reactor = "0.1" tokio-timer = "0.2" tokio-udp = "0.1" diff --git a/misc/multiaddr/Cargo.toml b/misc/multiaddr/Cargo.toml index 178494cc..4022e248 100644 --- a/misc/multiaddr/Cargo.toml +++ b/misc/multiaddr/Cargo.toml @@ -15,7 +15,7 @@ byteorder = "0.4" data-encoding = "2.1" multihash = { path = "../multihash" } serde = "1.0.70" -unsigned-varint = "0.1" +unsigned-varint = "0.2" [dev-dependencies] bincode = "1" @@ -23,5 +23,5 @@ bs58 = "0.2.0" data-encoding = "2" multihash = { path = "../multihash" } quickcheck = "0.7" -rand = "0.5" +rand = "0.6" serde_json = "1.0" \ No newline at end of file diff --git a/misc/multihash/Cargo.toml b/misc/multihash/Cargo.toml index 3aac4a34..9c324620 100644 --- a/misc/multihash/Cargo.toml +++ b/misc/multihash/Cargo.toml @@ -16,9 +16,9 @@ readme = "README.md" documentation = "https://docs.rs/multihash/" [dependencies] -blake2 = { version = "0.7", default-features = false } +blake2 = { version = "0.8", default-features = false } rand = { version = "0.6", default-features = false, features = ["std"] } -sha1 = "0.5" -sha2 = { version = "0.7", default-features = false } +sha1 = "0.6" +sha2 = { version = "0.8", default-features = false } tiny-keccak = "1.4" unsigned-varint = "0.2" diff --git a/misc/peer-id-generator/Cargo.toml b/misc/peer-id-generator/Cargo.toml index 101d3315..8806bb88 100644 --- a/misc/peer-id-generator/Cargo.toml +++ b/misc/peer-id-generator/Cargo.toml @@ -9,4 +9,4 @@ license = "MIT" libp2p-core = { path = "../../core" } libp2p-secio = { path = "../../protocols/secio" } num_cpus = "1.8" -rand = "0.5" +rand = "0.6" diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml index 20fe408c..ee7baeba 100644 --- a/muxers/mplex/Cargo.toml +++ b/muxers/mplex/Cargo.toml @@ -10,7 +10,7 @@ fnv = "1.0" futures = "0.1" libp2p-core = { path = "../../core" } log = "0.4" -parking_lot = "0.6" +parking_lot = "0.7" tokio-codec = "0.1" tokio-io = "0.1" unsigned-varint = { version = "0.2.1", features = ["codec"] } diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml index 917881c7..446327ca 100644 --- a/muxers/yamux/Cargo.toml +++ b/muxers/yamux/Cargo.toml @@ -9,6 +9,6 @@ bytes = "0.4" futures = "0.1" libp2p-core = { path = "../../core" } log = "0.4" -parking_lot = "0.6" +parking_lot = "0.7" tokio-io = "0.1" yamux = "0.1" diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml index 78e750cf..c6f5ae18 100644 --- a/protocols/floodsub/Cargo.toml +++ b/protocols/floodsub/Cargo.toml @@ -12,7 +12,7 @@ fnv = "1.0" futures = "0.1" libp2p-core = { path = "../../core" } protobuf = "2.0.2" -rand = "0.5" +rand = "0.6" smallvec = "0.6.5" tokio-codec = "0.1" tokio-io = "0.1" diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml index f32acee6..822c3ee6 100644 --- a/protocols/identify/Cargo.toml +++ b/protocols/identify/Cargo.toml @@ -12,7 +12,7 @@ libp2p-peerstore = { path = "../../stores/peerstore" } libp2p-core = { path = "../../core" } log = "0.4.1" multiaddr = { path = "../../misc/multiaddr" } -parking_lot = "0.6" +parking_lot = "0.7" protobuf = "2.0.2" smallvec = "0.6" tokio-codec = "0.1" diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml index 1bf93426..a372424e 100644 --- a/protocols/kad/Cargo.toml +++ b/protocols/kad/Cargo.toml @@ -18,9 +18,9 @@ libp2p-core = { path = "../../core" } log = "0.4" multiaddr = { path = "../../misc/multiaddr" } multihash = { path = "../../misc/multihash" } -parking_lot = "0.6" +parking_lot = "0.7" protobuf = "2.0.2" -rand = "0.4.2" +rand = "0.6.0" smallvec = "0.6" tokio-codec = "0.1" tokio-io = "0.1" @@ -29,5 +29,4 @@ unsigned-varint = { version = "0.2.1", features = ["codec"] } [dev-dependencies] libp2p-tcp-transport = { path = "../../transports/tcp" } -rand = "0.4.2" tokio = "0.1" diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml index 9487c3bc..fcdaae7c 100644 --- a/protocols/ping/Cargo.toml +++ b/protocols/ping/Cargo.toml @@ -12,8 +12,8 @@ log = "0.4.1" multiaddr = { path = "../../misc/multiaddr" } multistream-select = { path = "../../misc/multistream-select" } futures = "0.1" -parking_lot = "0.6" -rand = "0.5" +parking_lot = "0.7" +rand = "0.6" tokio-codec = "0.1" tokio-io = "0.1" tokio-timer = "0.2.6" diff --git a/protocols/secio/Cargo.toml b/protocols/secio/Cargo.toml index b8f5690c..2497349f 100644 --- a/protocols/secio/Cargo.toml +++ b/protocols/secio/Cargo.toml @@ -11,13 +11,13 @@ futures = "0.1" libp2p-core = { path = "../../core" } log = "0.4.1" protobuf = "2.0.2" -rand = "0.5" +rand = "0.6" secp256k1 = {version = "0.11", optional = true } aes-ctr = "0.1.0" aesni = { version = "0.4.1", features = ["nocheck"], optional = true } twofish = "0.1.0" ctr = "0.1" -lazy_static = { version = "0.2.11", optional = true } +lazy_static = { version = "1.2.0", optional = true } rw-stream-sink = { path = "../../misc/rw-stream-sink" } tokio-io = "0.1.0" sha2 = "0.7.1" diff --git a/protocols/secio/src/lib.rs b/protocols/secio/src/lib.rs index 9951ce15..7068b509 100644 --- a/protocols/secio/src/lib.rs +++ b/protocols/secio/src/lib.rs @@ -259,7 +259,7 @@ impl SecioKeyPair { /// Generates a new Ed25519 key pair and uses it. pub fn ed25519_generated() -> Result> { - let mut csprng = rand::OsRng::new()?; + let mut csprng = rand::rngs::OsRng::new()?; let keypair: Ed25519KeyPair = Ed25519KeyPair::generate::(&mut csprng); Ok(SecioKeyPair { inner: SecioKeyPairInner::Ed25519 { diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml index 5f73b959..070e883c 100644 --- a/transports/dns/Cargo.toml +++ b/transports/dns/Cargo.toml @@ -9,7 +9,7 @@ libp2p-core = { path = "../../core" } log = "0.4.1" futures = "0.1" multiaddr = { path = "../../misc/multiaddr" } -tokio-dns-unofficial = "0.3" +tokio-dns-unofficial = "0.4" tokio-io = "0.1" [dev-dependencies] diff --git a/transports/relay/Cargo.toml b/transports/relay/Cargo.toml index 89bd5f4e..45f7045e 100644 --- a/transports/relay/Cargo.toml +++ b/transports/relay/Cargo.toml @@ -12,7 +12,7 @@ libp2p-core = { path = "../../core" } log = "0.4" multiaddr = { path = "../../misc/multiaddr" } protobuf = "2.0.2" -rand = "0.4" +rand = "0.6" tokio-codec = "0.1" tokio-io = "0.1" unsigned-varint = { version = "0.2.1", features = ["codec"] }