From 2d9de787251a49a332c3209b2846c09f6b48f9a2 Mon Sep 17 00:00:00 2001
From: Dr Maxim Orlovsky <orlovsky@pandoracore.com>
Date: Sat, 8 Jan 2022 13:46:11 +0100
Subject: [PATCH] Re-export all key types under `util::key`. Deprecate other
 exports.

---
 src/lib.rs          | 5 +----
 src/util/key.rs     | 2 +-
 src/util/schnorr.rs | 1 +
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index ef326038..5005744c 100644
--- a/src/lib.rs
+++ b/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;
 
diff --git a/src/util/key.rs b/src/util/key.rs
index 9cd44e73..9d39c188 100644
--- a/src/util/key.rs
+++ b/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;
diff --git a/src/util/schnorr.rs b/src/util/schnorr.rs
index 6a0c9fa1..93ab06ec 100644
--- a/src/util/schnorr.rs
+++ b/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;