From c0fbd1d7c3346e86857047ae7491f1b6506777f5 Mon Sep 17 00:00:00 2001 From: Ismail Khoffi Date: Wed, 23 Jan 2019 18:29:37 +0100 Subject: [PATCH] bump rand version to match x25519-dalek's (^0.6) --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- tendermint-rs/Cargo.toml | 2 +- tendermint-rs/src/secret_connection/mod.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 173e051..2debc95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -872,7 +872,7 @@ dependencies = [ "hkdf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "prost-amino 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "prost-amino-derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", @@ -918,7 +918,7 @@ dependencies = [ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "prost-amino 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "prost-amino-derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 6bc30cf..a861c63 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ failure_derive = "0.1" lazy_static = "1" prost-amino = "0.4.0" prost-amino-derive = "0.4.0" -rand = "0.5" +rand = "0.6" serde = "1" serde_derive = "1" serde_json = "1" diff --git a/tendermint-rs/Cargo.toml b/tendermint-rs/Cargo.toml index 2d19ae3..769cdc9 100644 --- a/tendermint-rs/Cargo.toml +++ b/tendermint-rs/Cargo.toml @@ -35,7 +35,7 @@ failure_derive = "0.1" hkdf = { version = "0.7", optional = true } prost-amino = { version = "0.4.0", optional = true } prost-amino-derive = { version = "0.4.0", optional = true } -rand = { version = "0.5", optional = true } +rand = { version = "0.6", optional = true } ring = { version = "0.13", optional = true } serde = { version = "1", optional = true } serde_derive = { version = "1", optional = true } diff --git a/tendermint-rs/src/secret_connection/mod.rs b/tendermint-rs/src/secret_connection/mod.rs index 56257ce..c37ced1 100644 --- a/tendermint-rs/src/secret_connection/mod.rs +++ b/tendermint-rs/src/secret_connection/mod.rs @@ -9,7 +9,7 @@ mod kdf; mod nonce; use self::{ - rand::OsRng, + rand::rngs::OsRng, ring::aead, x25519_dalek::{EphemeralPublic, EphemeralSecret}, };