Misc fixes

Author: sanket1729

src/zkp/musig.rs

@@ -18,7 +18,7 @@ use crate::{Message, PublicKey, Secp256k1, SecretKey, Tweak};
 use crate::{Signing, Verification};
 use secp256k1::Parity;
 
-#[cfg(feature = "rand")]
+#[cfg(feature = "actual-rand")]
 use rand::{CryptoRng, RngCore};
 
 ///  Cached data related to a key aggregation.
@@ -43,7 +43,7 @@ impl MusigSessionId {
     }
 
     /// Creates a new [`MusigSessionId`] with random bytes from the given rng
-    #[cfg(feature = "rand")]
+    #[cfg(feature = "actual-rand")]
     pub fn new<R: RngCore + CryptoRng>(rng: &mut R) -> Self {
         let mut session_id = [0u8; 32];
         rng.fill_bytes(&mut session_id);
@@ -627,74 +627,6 @@ impl fmt::Display for ParseError {
 ///
 /// The [`schnorr::Signature`] with the adaptor applied.
 ///
-/// Example:
-///
-/// ```rust
-/// # # [cfg(any(test, feature = "rand-std"))] {
-/// # use secp256k1_zkp::rand::{thread_rng, RngCore};
-/// # use secp256k1_zkp::{MusigKeyAggCache, Secp256k1, SecretKey, KeyPair, PublicKey, MusigSessionId, Message, MusigAggNonce, MusigSession, Tweak, adapt};
-/// # let secp = Secp256k1::new();
-/// # let sk1 = SecretKey::new(&mut thread_rng());
-/// # let pub_key1 = PublicKey::from_secret_key(&secp, &sk1);
-/// # let sk2 = SecretKey::new(&mut thread_rng());
-/// # let pub_key2 = PublicKey::from_secret_key(&secp, &sk2);
-///
-/// let key_agg_cache = MusigKeyAggCache::new(&secp, &[pub_key1, pub_key2]);
-/// // The session id must be sampled at random. Read documentation for more details.
-///
-/// let msg = Message::from_slice(b"Public Message we want to sign!!").unwrap();
-///
-/// // Provide the current time for mis-use resistance
-/// let session_id1 = MusigSessionId::new(&mut thread_rng());
-/// let (mut sec_nonce1, pub_nonce1) = key_agg_cache.nonce_gen(&secp, session_id1, pub_key1, msg, None)
-///     .expect("non zero session id");
-///
-/// // Signer two does the same. Possibly on a different device
-/// let session_id2 = MusigSessionId::new(&mut thread_rng());
-/// let (mut sec_nonce2, pub_nonce2) = key_agg_cache.nonce_gen(&secp, session_id2, pub_key2, msg, None)
-///     .expect("non zero session id");
-///
-/// let aggnonce = MusigAggNonce::new(&secp, &[pub_nonce1, pub_nonce2]);
-///
-/// // Tweak with a secret adaptor
-/// let adapt_sec = SecretKey::new(&mut thread_rng());
-/// let adapt_pub = PublicKey::from_secret_key(&secp, &adapt_sec);
-/// let adapt_sec = Tweak::from_slice(adapt_sec.as_ref()).unwrap();
-///
-/// let session = MusigSession::with_adaptor(
-///     &secp,
-///     &key_agg_cache,
-///     aggnonce,
-///     msg,
-///     adapt_pub, // adaptor here
-/// );
-///
-/// let partial_sig1 = session.partial_sign(
-///     &secp,
-///     sec_nonce1,
-///     &KeyPair::from_secret_key(&secp, &sk1),
-///     &key_agg_cache,
-/// ).unwrap();
-///
-/// // Other party creates the other partial signature
-/// let partial_sig2 = session.partial_sign(
-///     &secp,
-///     sec_nonce2,
-///     &KeyPair::from_secret_key(&secp, &sk2),
-///     &key_agg_cache,
-/// ).unwrap();
-///
-/// let nonce_parity = session.nonce_parity();
-/// let pre_sig = session.partial_sig_agg(&[partial_sig1, partial_sig2]);
-///
-/// // Note that without the adaptor, the aggregated signature will fail verification
-/// let agg_pk = key_agg_cache.agg_pk();
-/// assert!(secp.verify_schnorr(&pre_sig, &msg, &agg_pk).is_err());
-/// // Get the final schnorr signature
-/// let schnorr_sig = adapt(pre_sig, adapt_sec, nonce_parity);
-/// assert!(secp.verify_schnorr(&schnorr_sig, &msg, &agg_pk).is_ok());
-/// # }
-/// ```
 pub fn adapt(
     pre_sig: schnorr::Signature,
     sec_adaptor: Tweak,
@@ -1240,51 +1172,6 @@ impl MusigSession {
     ///
     /// - If the provided [`MusigSecNonce`] has already been used for signing
     ///
-    /// # Example:
-    ///
-    /// ```rust
-    /// # # [cfg(any(test, feature = "rand-std"))] {
-    /// # use secp256k1_zkp::rand::{thread_rng, RngCore};
-    /// # use secp256k1_zkp::{MusigKeyAggCache, Secp256k1, SecretKey, KeyPair, PublicKey, MusigSessionId, Message, MusigAggNonce, MusigSession};
-    /// # let secp = Secp256k1::new();
-    /// # let sk1 = SecretKey::new(&mut thread_rng());
-    /// # let pub_key1 = PublicKey::from_secret_key(&secp, &sk1);
-    /// # let sk2 = SecretKey::new(&mut thread_rng());
-    /// # let pub_key2 = PublicKey::from_secret_key(&secp, &sk2);
-    ///
-    /// # let key_agg_cache = MusigKeyAggCache::new(&secp, &[pub_key1, pub_key2]);
-    /// // The session id must be sampled at random. Read documentation for more details.
-    ///
-    /// let msg = Message::from_slice(b"Public Message we want to sign!!").unwrap();
-    ///
-    /// // Provide the current time for mis-use resistance
-    /// let session_id1 = MusigSessionId::new(&mut thread_rng());
-    /// let (mut sec_nonce1, pub_nonce1) = key_agg_cache.nonce_gen(&secp, session_id1, pub_key1, msg, None)
-    ///     .expect("non zero session id");
-    ///
-    /// // Signer two does the same. Possibly on a different device
-    /// let session_id2 = MusigSessionId::new(&mut thread_rng());
-    /// let (_sec_nonce2, pub_nonce2) = key_agg_cache.nonce_gen(&secp, session_id2, pub_key2, msg, None)
-    ///     .expect("non zero session id");
-    ///
-    /// let aggnonce = MusigAggNonce::new(&secp, &[pub_nonce1, pub_nonce2]);
-    ///
-    /// let session = MusigSession::new(
-    ///     &secp,
-    ///     &key_agg_cache,
-    ///     aggnonce,
-    ///     msg,
-    /// );
-    ///
-    /// let keypair = KeyPair::from_secret_key(&secp, &sk1);
-    /// let _partial_sig = session.partial_sign(
-    ///     &secp,
-    ///     sec_nonce1,
-    ///     &keypair,
-    ///     &key_agg_cache,
-    /// ).unwrap();
-    /// # }
-    /// ```
     pub fn partial_sign<C: Signing>(
         &self,
         secp: &Secp256k1<C>,
@@ -1551,7 +1438,7 @@ impl fmt::Display for MusigSignError {
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, feature = "global-context"))]
 mod tests {
     use super::*;
     use rand::{thread_rng, RngCore};