Re-export all key types under util::key. Deprecate other exports.

Author: dr-orlovsky

src/lib.rs

@@ -138,10 +138,7 @@ pub use util::sighash::SchnorrSigHashType;
 
 pub use util::ecdsa::{self, EcdsaSig, EcdsaSigError};
 pub use util::schnorr::{self, SchnorrSig, SchnorrSigError};
-#[deprecated(since = "0.26.1", note = "Please use `ecdsa::PrivateKey` instead")]
-pub use util::ecdsa::PrivateKey;
-#[deprecated(since = "0.26.1", note = "Please use `ecdsa::PublicKey` instead")]
-pub use util::ecdsa::PublicKey;
+pub use util::key::{PrivateKey, PublicKey, XOnlyPublicKey, KeyPair};
 #[allow(deprecated)]
 pub use blockdata::transaction::SigHashType;
 

src/util/key.rs

@@ -16,8 +16,8 @@
 //! This module provides keys used in Bitcoin that can be roundtrip (de)serialized.
 //!
 
-#[deprecated(since = "0.26.1", note = "Please use `util::ecdsa` instead")]
 pub use util::ecdsa::{PrivateKey, PublicKey};
+pub use secp256k1::{XOnlyPublicKey, KeyPair};
 
 use core::fmt;
 #[cfg(feature = "std")] use std::error;

src/util/schnorr.rs

@@ -20,6 +20,7 @@
 use core::fmt;
 use prelude::*;
 
+#[deprecated(since = "0.28.0", note = "Please use `util::key` instead")]
 pub use secp256k1::{XOnlyPublicKey, KeyPair};
 use secp256k1::{self, Secp256k1, Verification, constants};
 use hashes::Hash;