Skip to content

Commit 074a4ac

Browse files
committed
Remove context from Keypair functions
As we did for `PublicKey` get rid of the context.
1 parent f8bf19d commit 074a4ac

File tree

11 files changed

+106
-140
lines changed

11 files changed

+106
-140
lines changed

examples/generate_keys.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
extern crate secp256k1;
22

3-
use secp256k1::{PublicKey, Secp256k1, SecretKey};
3+
use secp256k1::{PublicKey, SecretKey};
44

55
fn main() {
6-
let secp = Secp256k1::new();
76
let mut rng = rand::rng();
87
// First option:
9-
let (seckey, pubkey) = secp.generate_keypair(&mut rng);
8+
let (seckey, pubkey) = secp256k1::generate_keypair(&mut rng);
109

1110
assert_eq!(pubkey, PublicKey::from_secret_key(&seckey));
1211

examples/musig.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fn main() {
1010
let secp = Secp256k1::new();
1111
let mut rng = rand::rng();
1212

13-
let (seckey1, pubkey1) = secp.generate_keypair(&mut rng);
13+
let (seckey1, pubkey1) = secp256k1::generate_keypair(&mut rng);
1414

1515
let seckey2 = SecretKey::new(&mut rng);
1616
let pubkey2 = PublicKey::from_secret_key(&seckey2);
@@ -76,10 +76,10 @@ fn main() {
7676

7777
let session = Session::new(&secp, &musig_key_agg_cache, agg_nonce, msg);
7878

79-
let keypair1 = Keypair::from_secret_key(&secp, &seckey1);
79+
let keypair1 = Keypair::from_secret_key(&seckey1);
8080
let partial_sign1 = session.partial_sign(&secp, sec_nonce1, &keypair1, &musig_key_agg_cache);
8181

82-
let keypair2 = Keypair::from_secret_key(&secp, &seckey2);
82+
let keypair2 = Keypair::from_secret_key(&seckey2);
8383
let partial_sign2 = session.partial_sign(&secp, sec_nonce2, &keypair2, &musig_key_agg_cache);
8484

8585
let is_partial_signature_valid =

src/context/mod.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ pub mod global {
3838
///
3939
/// If `rand` and `std` feature is enabled, context will have been randomized using
4040
/// `rng`.
41-
///
42-
/// ```
43-
/// # #[cfg(all(feature = "global-context", feature = "rand", feature = "std"))] {
44-
/// use secp256k1::{PublicKey, SECP256K1};
45-
/// let _ = SECP256K1.generate_keypair(&mut rand::rng());
46-
/// # }
47-
/// ```
4841
pub static SECP256K1: &GlobalContext = &GlobalContext { __private: () };
4942

5043
impl Deref for GlobalContext {

src/ecdh.rs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ const SHARED_SECRET_SIZE: usize = constants::SECRET_KEY_SIZE;
2121
///
2222
/// ```
2323
/// # #[cfg(all(feature = "rand", feature = "std"))] {
24-
/// # use secp256k1::{rand, Secp256k1};
25-
/// # use secp256k1::ecdh::SharedSecret;
26-
/// let s = Secp256k1::new();
27-
/// let (sk1, pk1) = s.generate_keypair(&mut rand::rng());
28-
/// let (sk2, pk2) = s.generate_keypair(&mut rand::rng());
24+
/// # use secp256k1::{rand, ecdh::SharedSecret};
25+
/// let (sk1, pk1) = secp256k1::generate_keypair(&mut rand::rng());
26+
/// let (sk2, pk2) = secp256k1::generate_keypair(&mut rand::rng());
2927
/// let sec1 = SharedSecret::new(&pk2, &sk1);
3028
/// let sec2 = SharedSecret::new(&pk1, &sk2);
3129
/// assert_eq!(sec1, sec2);
@@ -112,11 +110,10 @@ impl AsRef<[u8]> for SharedSecret {
112110
/// # Examples
113111
/// ```ignore
114112
/// use bitcoin_hashes::{Hash, sha512};
115-
/// use secp256k1::{ecdh, rand, Secp256k1, PublicKey, SecretKey};
113+
/// use secp256k1::{ecdh, rand, PublicKey, SecretKey};
116114
///
117-
/// let s = Secp256k1::new();
118-
/// let (sk1, pk1) = s.generate_keypair(&mut rand::rng());
119-
/// let (sk2, pk2) = s.generate_keypair(&mut rand::rng());
115+
/// let (sk1, pk1) = crate::generate_keypair(&mut rand::rng());
116+
/// let (sk2, pk2) = crate::generate_keypair(&mut rand::rng());
120117
///
121118
/// let point1 = ecdh::shared_secret_point(&pk2, &sk1);
122119
/// let secret1 = sha512::Hash::hash(&point1);
@@ -189,7 +186,6 @@ mod tests {
189186
use wasm_bindgen_test::wasm_bindgen_test as test;
190187

191188
use super::SharedSecret;
192-
use crate::Secp256k1;
193189

194190
#[test]
195191
fn ecdh() {
@@ -251,11 +247,9 @@ mod benches {
251247
use test::{black_box, Bencher};
252248

253249
use super::SharedSecret;
254-
use crate::Secp256k1;
255250

256251
#[bench]
257252
pub fn bench_ecdh(bh: &mut Bencher) {
258-
let s = Secp256k1::signing_only();
259253
let (sk, pk) = s.generate_keypair(&mut rand::rng());
260254

261255
bh.iter(|| {

src/ecdsa/mod.rs

Lines changed: 1 addition & 1 deletion
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::rng());
374+
/// # let (secret_key, public_key) = secp256k1::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);

0 commit comments

Comments
 (0)