Skip to content

Commit 229be29

Browse files
committed
EcdsaSigHashType -> EcdsaSighashType
1 parent 43e36ff commit 229be29

4 files changed

Lines changed: 90 additions & 90 deletions

File tree

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pub use bitcoin::bech32;
7272
pub use bitcoin::hashes;
7373
// export everything at the top level so it can be used as `elements::Transaction` etc.
7474
pub use crate::address::{Address, AddressParams, AddressError};
75-
pub use crate::transaction::{OutPoint, PeginData, PegoutData, EcdsaSigHashType, TxIn, TxOut, TxInWitness, TxOutWitness, Transaction, AssetIssuance};
75+
pub use crate::transaction::{OutPoint, PeginData, PegoutData, EcdsaSighashType, TxIn, TxOut, TxInWitness, TxOutWitness, Transaction, AssetIssuance};
7676
pub use crate::transaction::Sequence;
7777
pub use crate::blind::{ConfidentialTxOutError, TxOutSecrets, SurjectionInput, TxOutError, VerificationError, BlindError, UnblindError, BlindValueProofs, BlindAssetProofs};
7878
pub use crate::block::{BlockHeader, Block};

src/pset/map/input.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use crate::pset::raw;
3131
use crate::pset::serialize;
3232
use crate::pset::{self, error, Error};
3333
use crate::{transaction::SighashTypeParseError, SchnorrSighashType};
34-
use crate::{AssetIssuance, BlockHash, EcdsaSigHashType, Script, Transaction, TxIn, TxOut, Txid};
34+
use crate::{AssetIssuance, BlockHash, EcdsaSighashType, Script, Transaction, TxIn, TxOut, Txid};
3535
use bitcoin::bip32::KeySource;
3636
use bitcoin::{PublicKey, key::XOnlyPublicKey};
3737
use secp256k1_zkp::{self, RangeProof, Tweak, ZERO_TWEAK};
@@ -292,7 +292,7 @@ impl Default for Input {
292292
}
293293

294294
/// A Signature hash type for the corresponding input. As of taproot upgrade, the signature hash
295-
/// type can be either [`EcdsaSigHashType`] or [`SchnorrSighashType`] but it is not possible to know
295+
/// type can be either [`EcdsaSighashType`] or [`SchnorrSighashType`] but it is not possible to know
296296
/// directly which signature hash type the user is dealing with. Therefore, the user is responsible
297297
/// for converting to/from [`PsbtSighashType`] from/to the desired signature hash type they need.
298298
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -341,8 +341,8 @@ impl FromStr for PsbtSighashType {
341341
})
342342
}
343343
}
344-
impl From<EcdsaSigHashType> for PsbtSighashType {
345-
fn from(ecdsa_hash_ty: EcdsaSigHashType) -> Self {
344+
impl From<EcdsaSighashType> for PsbtSighashType {
345+
fn from(ecdsa_hash_ty: EcdsaSighashType) -> Self {
346346
PsbtSighashType {
347347
inner: ecdsa_hash_ty as u32,
348348
}
@@ -358,10 +358,10 @@ impl From<SchnorrSighashType> for PsbtSighashType {
358358
}
359359

360360
impl PsbtSighashType {
361-
/// Returns the [`EcdsaSigHashType`] if the [`PsbtSighashType`] can be
361+
/// Returns the [`EcdsaSighashType`] if the [`PsbtSighashType`] can be
362362
/// converted to one.
363-
pub fn ecdsa_hash_ty(self) -> Option<EcdsaSigHashType> {
364-
EcdsaSigHashType::from_standard(self.inner).ok()
363+
pub fn ecdsa_hash_ty(self) -> Option<EcdsaSighashType> {
364+
EcdsaSighashType::from_standard(self.inner).ok()
365365
}
366366

367367
/// Returns the [`SchnorrSighashType`] if the [`PsbtSighashType`] can be
@@ -390,16 +390,16 @@ impl PsbtSighashType {
390390
}
391391

392392
impl Input {
393-
/// Obtains the [`EcdsaSigHashType`] for this input if one is specified. If no sighash type is
394-
/// specified, returns [`EcdsaSigHashType::All`].
393+
/// Obtains the [`EcdsaSighashType`] for this input if one is specified. If no sighash type is
394+
/// specified, returns [`EcdsaSighashType::All`].
395395
///
396396
/// # Errors
397397
///
398398
/// If the `sighash_type` field is set to a non-standard ECDSA sighash value.
399-
pub fn ecdsa_hash_ty(&self) -> Option<EcdsaSigHashType> {
399+
pub fn ecdsa_hash_ty(&self) -> Option<EcdsaSighashType> {
400400
self.sighash_type
401401
.map(|sighash_type| sighash_type.ecdsa_hash_ty())
402-
.unwrap_or(Some(EcdsaSigHashType::All))
402+
.unwrap_or(Some(EcdsaSighashType::All))
403403
}
404404

405405
/// Obtains the [`SchnorrSighashType`] for this input if one is specified. If no sighash type is

0 commit comments

Comments
 (0)