-use bitcoin::secp256k1::key::PublicKey as SecpPublicKey;
-use bitcoin::secp256k1::key::SecretKey as SecpSecretKey;
-use bitcoin::secp256k1::Signature as SecpSignature;
+use bitcoin::secp256k1::PublicKey as SecpPublicKey;
+use bitcoin::secp256k1::SecretKey as SecpSecretKey;
+use bitcoin::secp256k1::ecdsa::Signature as SecpSignature;
-use bitcoin::secp256k1::recovery::RecoveryId;
-use bitcoin::secp256k1::recovery::RecoverableSignature as SecpRecoverableSignature;
+use bitcoin::secp256k1::ecdsa::RecoveryId;
+use bitcoin::secp256k1::ecdsa::RecoverableSignature as SecpRecoverableSignature;
SecpError::InvalidPublicKey => Secp256k1Error::InvalidPublicKey,
SecpError::InvalidSignature => Secp256k1Error::InvalidSignature,
SecpError::InvalidSecretKey => Secp256k1Error::InvalidSecretKey,
SecpError::InvalidPublicKey => Secp256k1Error::InvalidPublicKey,
SecpError::InvalidSignature => Secp256k1Error::InvalidSignature,
SecpError::InvalidSecretKey => Secp256k1Error::InvalidSecretKey,
SecpError::InvalidRecoveryId => Secp256k1Error::InvalidRecoveryId,
SecpError::InvalidTweak => Secp256k1Error::InvalidTweak,
SecpError::InvalidRecoveryId => Secp256k1Error::InvalidRecoveryId,
SecpError::InvalidTweak => Secp256k1Error::InvalidTweak,
match self {
Secp256k1Error::IncorrectSignature => SecpError::IncorrectSignature,
Secp256k1Error::InvalidMessage => SecpError::InvalidMessage,
Secp256k1Error::InvalidPublicKey => SecpError::InvalidPublicKey,
Secp256k1Error::InvalidSignature => SecpError::InvalidSignature,
Secp256k1Error::InvalidSecretKey => SecpError::InvalidSecretKey,
match self {
Secp256k1Error::IncorrectSignature => SecpError::IncorrectSignature,
Secp256k1Error::InvalidMessage => SecpError::InvalidMessage,
Secp256k1Error::InvalidPublicKey => SecpError::InvalidPublicKey,
Secp256k1Error::InvalidSignature => SecpError::InvalidSignature,
Secp256k1Error::InvalidSecretKey => SecpError::InvalidSecretKey,
Secp256k1Error::InvalidRecoveryId => SecpError::InvalidRecoveryId,
Secp256k1Error::InvalidTweak => SecpError::InvalidTweak,
Secp256k1Error::InvalidRecoveryId => SecpError::InvalidRecoveryId,
Secp256k1Error::InvalidTweak => SecpError::InvalidTweak,