Skip to content

Commit

Permalink
Update rand_core to 0.5 (#57)
Browse files Browse the repository at this point in the history
  • Loading branch information
hdevalence authored Nov 26, 2019
1 parent 1824ca1 commit 5616925
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
7 changes: 3 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,13 @@ features = ["nightly"]
keccak = { version = "0.1.0", default-features = false }
byteorder = { version = "1.2.4", default-features = false }
zeroize = { version = "1", default-features = false, features = ["zeroize_derive"] }
rand_core = { version = "0.4", default-features = false }
rand_core = { version = "0.5", default-features = false }
hex = {version = "0.3", default-features = false, optional = true}

[dev-dependencies]
strobe-rs = "0.5"
curve25519-dalek = "1"
rand_chacha = "0.1"
rand = "0.6"
curve25519-dalek = "2"
rand_chacha = "0.2"

[features]
default = ["std"]
Expand Down
6 changes: 3 additions & 3 deletions src/transcript.rs
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ impl Transcript {
/// [`Transcript`] to an owned [`TranscriptRng`] as follows:
/// ```
/// # extern crate merlin;
/// # extern crate rand;
/// # extern crate rand_core;
/// # use merlin::Transcript;
/// # fn main() {
/// # let mut transcript = Transcript::new(b"TranscriptRng doctest");
Expand All @@ -246,7 +246,7 @@ impl Transcript {
/// .build_rng()
/// .rekey_with_witness_bytes(b"witness1", witness_data)
/// .rekey_with_witness_bytes(b"witness2", more_witness_data)
/// .finalize(&mut rand::thread_rng());
/// .finalize(&mut rand_core::OsRng);
/// # }
/// ```
/// In this example, the final `rng` is a PRF of `public_data`
Expand Down Expand Up @@ -477,8 +477,8 @@ mod tests {
#[test]
fn transcript_rng_is_bound_to_transcript_and_witnesses() {
use curve25519_dalek::scalar::Scalar;
use rand::SeedableRng;
use rand_chacha::ChaChaRng;
use rand_core::SeedableRng;

// Check that the TranscriptRng is bound to the transcript and
// the witnesses. This is done by producing a sequence of
Expand Down

0 comments on commit 5616925

Please sign in to comment.