Merge rust-bitcoin/rust-bitcoin#1605: `psbt` cleanup
4a03e2e721
psbt: Remove unused error variant (Tobin C. Harding) Pull request description: Remove an unused error variant for PSBT code (API breaking because the error type is public). Woops, somehow I managed to get what was patch 1 of this series merged yesterday, I thought I left it out. Anyways, this is just the remove unused error variant now. No changes to that patch from previous versions of the PR. ACKs for top commit: apoelstra: ACK4a03e2e721
Kixunil: ACK4a03e2e721
Tree-SHA512: 228c661b97c6656db5a2bcc9ceb494ea485363b7f7262a97c677ee1639b5209c92ec3715ff48fdb108c95c828bfc83b6c475aa66f0ce8c5b0f286bfa7cc19554
This commit is contained in:
commit
b3221b0949
|
@ -646,8 +646,6 @@ pub enum SigningAlgorithm {
|
|||
/// Errors encountered while calculating the sighash message.
|
||||
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone)]
|
||||
pub enum SignError {
|
||||
/// An ECDSA key-related error occurred.
|
||||
EcdsaSig(ecdsa::Error),
|
||||
/// Input index out of bounds (actual index, maximum index allowed).
|
||||
IndexOutOfBounds(usize, usize),
|
||||
/// Invalid Sighash type.
|
||||
|
@ -695,7 +693,6 @@ impl fmt::Display for SignError {
|
|||
NotEcdsa => write!(f, "attempted to ECDSA sign an non-ECDSA input"),
|
||||
NotWpkh => write!(f, "the scriptPubkey is not a P2WPKH script"),
|
||||
SighashComputation(e) => write!(f, "sighash: {}", e),
|
||||
EcdsaSig(ref e) => write_err!(f, "ecdsa signature"; e),
|
||||
UnknownOutputType => write!(f, "unable to determine the output type"),
|
||||
KeyNotFound => write!(f, "unable to find key"),
|
||||
WrongSigningAlgorithm => write!(f, "attempt to sign an input with the wrong signing algorithm"),
|
||||
|
@ -724,7 +721,6 @@ impl std::error::Error for SignError {
|
|||
| KeyNotFound
|
||||
| WrongSigningAlgorithm
|
||||
| Unsupported => None,
|
||||
EcdsaSig(ref e) => Some(e),
|
||||
SighashComputation(ref e) => Some(e),
|
||||
}
|
||||
}
|
||||
|
@ -736,12 +732,6 @@ impl From<sighash::Error> for SignError {
|
|||
}
|
||||
}
|
||||
|
||||
impl From<ecdsa::Error> for SignError {
|
||||
fn from(e: ecdsa::Error) -> Self {
|
||||
SignError::EcdsaSig(e)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "base64")]
|
||||
mod display_from_str {
|
||||
use super::{PartiallySignedTransaction, Error};
|
||||
|
|
Loading…
Reference in New Issue