Skip to content

Commit 78e7479

Browse files
getonggetong
committed
rename thread_rng() to rng()
1 parent 2791338 commit 78e7479

13 files changed

+88
-92
lines changed

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ global-context-less-secure = ["global-context"]
3737
secp256k1-sys = { version = "0.11.0", default-features = false, path = "./secp256k1-sys" }
3838

3939
hashes = { package = "bitcoin_hashes", version = "0.16", default-features = false, optional = true }
40-
rand = { version = "0.9", default-features = false, optional = true }
40+
rand = { version = "0.9", default-features = false, features = ["thread_rng"], optional = true }
4141
serde = { version = "1.0.103", default-features = false, optional = true }
4242

4343
[dev-dependencies]

‎examples/generate_keys.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use secp256k1::{PublicKey, Secp256k1, SecretKey};
44

55
fn main() {
66
let secp = Secp256k1::new();
7-
let mut rng = rand::thread_rng();
7+
let mut rng = rand::rng();
88
// First option:
99
let (seckey, pubkey) = secp.generate_keypair(&mut rng);
1010

‎examples/sign_verify.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extern crate hashes;
22
extern crate secp256k1;
33

4-
use hashes::{sha256, Hash};
4+
use hashes::sha256;
55
use secp256k1::{ecdsa, Error, Message, PublicKey, Secp256k1, SecretKey, Signing, Verification};
66

77
fn verify<C: Verification>(

‎examples/sign_verify_recovery.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extern crate hashes;
22
extern crate secp256k1;
33

4-
use hashes::{sha256, Hash};
4+
use hashes::sha256;
55
use secp256k1::{ecdsa, Error, Message, PublicKey, Secp256k1, SecretKey, Signing, Verification};
66

77
fn recover<C: Verification>(

‎src/context.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pub mod global {
3333
/// ```
3434
/// # #[cfg(all(feature = "global-context", feature = "rand", feature = "std"))] {
3535
/// use secp256k1::{PublicKey, SECP256K1};
36-
/// let _ = SECP256K1.generate_keypair(&mut rand::thread_rng());
36+
/// let _ = SECP256K1.generate_keypair(&mut rand::rng());
3737
/// # }
3838
/// ```
3939
pub static SECP256K1: &GlobalContext = &GlobalContext { __private: () };
@@ -180,9 +180,9 @@ mod alloc_only {
180180
/// ```
181181
/// # #[cfg(all(feature = "rand", feature = "std"))] {
182182
/// # use secp256k1::Secp256k1;
183-
/// # use secp256k1::rand::{thread_rng, RngCore};
183+
/// # use secp256k1::rand::{rng, RngCore};
184184
/// let mut ctx = Secp256k1::new();
185-
/// # let mut rng = thread_rng();
185+
/// # let mut rng = rng();
186186
/// # let mut seed = [0u8; 32];
187187
/// # rng.fill_bytes(&mut seed);
188188
/// // let seed = <32 bytes of random data>
@@ -216,7 +216,7 @@ mod alloc_only {
216216
not(feature = "global-context-less-secure")
217217
))]
218218
{
219-
ctx.randomize(&mut rand::thread_rng());
219+
ctx.randomize(&mut rand::rng());
220220
}
221221

222222
#[allow(clippy::let_and_return)] // as for unusted_mut

‎src/ecdh.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ const SHARED_SECRET_SIZE: usize = constants::SECRET_KEY_SIZE;
2424
/// # use secp256k1::{rand, Secp256k1};
2525
/// # use secp256k1::ecdh::SharedSecret;
2626
/// let s = Secp256k1::new();
27-
/// let (sk1, pk1) = s.generate_keypair(&mut rand::thread_rng());
28-
/// let (sk2, pk2) = s.generate_keypair(&mut rand::thread_rng());
27+
/// let (sk1, pk1) = s.generate_keypair(&mut rand::rng());
28+
/// let (sk2, pk2) = s.generate_keypair(&mut rand::rng());
2929
/// let sec1 = SharedSecret::new(&pk2, &sk1);
3030
/// let sec2 = SharedSecret::new(&pk1, &sk2);
3131
/// assert_eq!(sec1, sec2);
@@ -116,8 +116,8 @@ impl AsRef<[u8]> for SharedSecret {
116116
/// # use secp256k1::hashes::{Hash, sha512};
117117
///
118118
/// let s = Secp256k1::new();
119-
/// let (sk1, pk1) = s.generate_keypair(&mut rand::thread_rng());
120-
/// let (sk2, pk2) = s.generate_keypair(&mut rand::thread_rng());
119+
/// let (sk1, pk1) = s.generate_keypair(&mut rand::rng());
120+
/// let (sk2, pk2) = s.generate_keypair(&mut rand::rng());
121121
///
122122
/// let point1 = ecdh::shared_secret_point(&pk2, &sk1);
123123
/// let secret1 = sha512::Hash::hash(&point1);
@@ -197,8 +197,8 @@ mod tests {
197197
#[cfg(all(feature = "rand", feature = "std"))]
198198
fn ecdh() {
199199
let s = Secp256k1::signing_only();
200-
let (sk1, pk1) = s.generate_keypair(&mut rand::thread_rng());
201-
let (sk2, pk2) = s.generate_keypair(&mut rand::thread_rng());
200+
let (sk1, pk1) = s.generate_keypair(&mut rand::rng());
201+
let (sk2, pk2) = s.generate_keypair(&mut rand::rng());
202202

203203
let sec1 = SharedSecret::new(&pk2, &sk1);
204204
let sec2 = SharedSecret::new(&pk1, &sk2);
@@ -233,8 +233,8 @@ mod tests {
233233
use crate::ecdh::shared_secret_point;
234234

235235
let s = Secp256k1::signing_only();
236-
let (sk1, _) = s.generate_keypair(&mut rand::thread_rng());
237-
let (_, pk2) = s.generate_keypair(&mut rand::thread_rng());
236+
let (sk1, _) = s.generate_keypair(&mut rand::rng());
237+
let (_, pk2) = s.generate_keypair(&mut rand::rng());
238238

239239
let secret_sys = SharedSecret::new(&pk2, &sk1);
240240

@@ -286,7 +286,7 @@ mod benches {
286286
#[bench]
287287
pub fn bench_ecdh(bh: &mut Bencher) {
288288
let s = Secp256k1::signing_only();
289-
let (sk, pk) = s.generate_keypair(&mut rand::thread_rng());
289+
let (sk, pk) = s.generate_keypair(&mut rand::rng());
290290

291291
bh.iter(|| {
292292
let res = SharedSecret::new(&pk, &sk);

‎src/ecdsa/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ impl<C: Verification> Secp256k1<C> {
371371
/// # use secp256k1::{rand, Secp256k1, Message, Error};
372372
/// #
373373
/// # let secp = Secp256k1::new();
374-
/// # let (secret_key, public_key) = secp.generate_keypair(&mut rand::thread_rng());
374+
/// # let (secret_key, public_key) = secp.generate_keypair(&mut rand::rng());
375375
/// #
376376
/// let message = Message::from_digest_slice(&[0xab; 32]).expect("32 bytes");
377377
/// let sig = secp.sign_ecdsa(message, &secret_key);

‎src/ecdsa/recovery.rs

+17-17
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,11 @@ mod tests {
260260
let vrfy = Secp256k1::verification_only();
261261
let full = Secp256k1::new();
262262

263-
let msg = crate::random_32_bytes(&mut rand::thread_rng());
263+
let msg = crate::random_32_bytes(&mut rand::rng());
264264
let msg = Message::from_digest_slice(&msg).unwrap();
265265

266266
// Try key generation
267-
let (sk, pk) = full.generate_keypair(&mut rand::thread_rng());
267+
let (sk, pk) = full.generate_keypair(&mut rand::rng());
268268

269269
// Try signing
270270
assert_eq!(sign.sign_ecdsa_recoverable(msg, &sk), full.sign_ecdsa_recoverable(msg, &sk));
@@ -290,7 +290,7 @@ mod tests {
290290
#[rustfmt::skip]
291291
fn sign() {
292292
let mut s = Secp256k1::new();
293-
s.randomize(&mut rand::thread_rng());
293+
s.randomize(&mut rand::rng());
294294

295295
let sk = SecretKey::from_slice(&ONE).unwrap();
296296
let msg = Message::from_digest_slice(&ONE).unwrap();
@@ -315,7 +315,7 @@ mod tests {
315315
#[rustfmt::skip]
316316
fn sign_with_noncedata() {
317317
let mut s = Secp256k1::new();
318-
s.randomize(&mut rand::thread_rng());
318+
s.randomize(&mut rand::rng());
319319

320320
let sk = SecretKey::from_slice(&ONE).unwrap();
321321
let msg = Message::from_digest_slice(&ONE).unwrap();
@@ -339,17 +339,17 @@ mod tests {
339339
#[cfg(all(feature = "rand", feature = "std"))]
340340
fn sign_and_verify_fail() {
341341
let mut s = Secp256k1::new();
342-
s.randomize(&mut rand::thread_rng());
342+
s.randomize(&mut rand::rng());
343343

344-
let msg = crate::random_32_bytes(&mut rand::thread_rng());
344+
let msg = crate::random_32_bytes(&mut rand::rng());
345345
let msg = Message::from_digest_slice(&msg).unwrap();
346346

347-
let (sk, pk) = s.generate_keypair(&mut rand::thread_rng());
347+
let (sk, pk) = s.generate_keypair(&mut rand::rng());
348348

349349
let sigr = s.sign_ecdsa_recoverable(msg, &sk);
350350
let sig = sigr.to_standard();
351351

352-
let msg = crate::random_32_bytes(&mut rand::thread_rng());
352+
let msg = crate::random_32_bytes(&mut rand::rng());
353353
let msg = Message::from_digest_slice(&msg).unwrap();
354354
assert_eq!(s.verify_ecdsa(msg, &sig, &pk), Err(Error::IncorrectSignature));
355355

@@ -361,12 +361,12 @@ mod tests {
361361
#[cfg(all(feature = "rand", feature = "std"))]
362362
fn sign_with_recovery() {
363363
let mut s = Secp256k1::new();
364-
s.randomize(&mut rand::thread_rng());
364+
s.randomize(&mut rand::rng());
365365

366-
let msg = crate::random_32_bytes(&mut rand::thread_rng());
366+
let msg = crate::random_32_bytes(&mut rand::rng());
367367
let msg = Message::from_digest_slice(&msg).unwrap();
368368

369-
let (sk, pk) = s.generate_keypair(&mut rand::thread_rng());
369+
let (sk, pk) = s.generate_keypair(&mut rand::rng());
370370

371371
let sig = s.sign_ecdsa_recoverable(msg, &sk);
372372

@@ -377,14 +377,14 @@ mod tests {
377377
#[cfg(all(feature = "rand", feature = "std"))]
378378
fn sign_with_recovery_and_noncedata() {
379379
let mut s = Secp256k1::new();
380-
s.randomize(&mut rand::thread_rng());
380+
s.randomize(&mut rand::rng());
381381

382-
let msg = crate::random_32_bytes(&mut rand::thread_rng());
382+
let msg = crate::random_32_bytes(&mut rand::rng());
383383
let msg = Message::from_digest_slice(&msg).unwrap();
384384

385385
let noncedata = [42u8; 32];
386386

387-
let (sk, pk) = s.generate_keypair(&mut rand::thread_rng());
387+
let (sk, pk) = s.generate_keypair(&mut rand::rng());
388388

389389
let sig = s.sign_ecdsa_recoverable_with_noncedata(msg, &sk, &noncedata);
390390

@@ -395,7 +395,7 @@ mod tests {
395395
#[cfg(all(feature = "rand", feature = "std"))]
396396
fn bad_recovery() {
397397
let mut s = Secp256k1::new();
398-
s.randomize(&mut rand::thread_rng());
398+
s.randomize(&mut rand::rng());
399399

400400
let msg = Message::from_digest_slice(&[0x55; 32]).unwrap();
401401

@@ -467,9 +467,9 @@ mod benches {
467467
#[bench]
468468
pub fn bench_recover(bh: &mut Bencher) {
469469
let s = Secp256k1::new();
470-
let msg = crate::random_32_bytes(&mut rand::thread_rng());
470+
let msg = crate::random_32_bytes(&mut rand::rng());
471471
let msg = Message::from_digest_slice(&msg).unwrap();
472-
let (sk, _) = s.generate_keypair(&mut rand::thread_rng());
472+
let (sk, _) = s.generate_keypair(&mut rand::rng());
473473
let sig = s.sign_ecdsa_recoverable(&msg, &sk);
474474

475475
bh.iter(|| {

0 commit comments

Comments
 (0)