diff --git a/bitcoin/examples/sighash.rs b/bitcoin/examples/sighash.rs index 1520f2022..370dd89dd 100644 --- a/bitcoin/examples/sighash.rs +++ b/bitcoin/examples/sighash.rs @@ -45,7 +45,7 @@ fn compute_sighash_p2wpkh(raw_tx: &[u8], inp_idx: usize, value: u64) { let sighash = cache .p2wpkh_signature_hash(inp_idx, &spk, Amount::from_sat(value), sig.sighash_type) .expect("failed to compute sighash"); - println!("Segwit p2wpkh sighash: {:x}", sighash); + println!("SegWit p2wpkh sighash: {:x}", sighash); let msg = secp256k1::Message::from(sighash); println!("Message is {:x}", msg); let secp = secp256k1::Secp256k1::verification_only(); @@ -132,7 +132,7 @@ fn compute_sighash_p2wsh(raw_tx: &[u8], inp_idx: usize, value: u64) { sig.sighash_type, ) .expect("failed to compute sighash"); - println!("Segwit p2wsh sighash: {:x} ({})", sighash, sig.sighash_type); + println!("SegWit p2wsh sighash: {:x} ({})", sighash, sig.sighash_type); } } diff --git a/bitcoin/src/address/error.rs b/bitcoin/src/address/error.rs index 40f495587..1de9e7f95 100644 --- a/bitcoin/src/address/error.rs +++ b/bitcoin/src/address/error.rs @@ -182,7 +182,7 @@ impl fmt::Display for Bech32Error { use Bech32Error::*; match *self { - ParseBech32(ref e) => write_err!(f, "segwit parsing error"; e), + ParseBech32(ref e) => write_err!(f, "SegWit parsing error"; e), WitnessVersion(ref e) => write_err!(f, "witness version conversion/parsing error"; e), WitnessProgram(ref e) => write_err!(f, "witness program error"; e), UnknownHrp(ref e) => write_err!(f, "unknown hrp error"; e), diff --git a/bitcoin/src/consensus/error.rs b/bitcoin/src/consensus/error.rs index 51b630757..e69e75b96 100644 --- a/bitcoin/src/consensus/error.rs +++ b/bitcoin/src/consensus/error.rs @@ -184,7 +184,7 @@ impl fmt::Display for ParseError { NonMinimalVarInt => write!(f, "non-minimal varint"), ParseFailed(ref s) => write!(f, "parse failed: {}", s), UnsupportedSegwitFlag(ref swflag) => - write!(f, "unsupported segwit version: {}", swflag), + write!(f, "unsupported SegWit version: {}", swflag), } } } diff --git a/bitcoin/src/crypto/key.rs b/bitcoin/src/crypto/key.rs index a35675972..559df1dc1 100644 --- a/bitcoin/src/crypto/key.rs +++ b/bitcoin/src/crypto/key.rs @@ -1100,7 +1100,7 @@ pub struct UncompressedPublicKeyError; impl fmt::Display for UncompressedPublicKeyError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("segwit public keys must always be compressed") + f.write_str("SegWit public keys must always be compressed") } } diff --git a/bitcoin/src/crypto/sighash.rs b/bitcoin/src/crypto/sighash.rs index 35fe0f8f1..abc8df43e 100644 --- a/bitcoin/src/crypto/sighash.rs +++ b/bitcoin/src/crypto/sighash.rs @@ -1273,7 +1273,7 @@ impl fmt::Display for P2wpkhError { use P2wpkhError::*; match *self { - Sighash(ref e) => write_err!(f, "error encoding segwit v0 signing data"; e), + Sighash(ref e) => write_err!(f, "error encoding SegWit v0 signing data"; e), NotP2wpkhScript => write!(f, "script is not a script pubkey for a p2wpkh output"), } } diff --git a/bitcoin/src/psbt/mod.rs b/bitcoin/src/psbt/mod.rs index 1cc34dfdd..071b5afa3 100644 --- a/bitcoin/src/psbt/mod.rs +++ b/bitcoin/src/psbt/mod.rs @@ -986,7 +986,7 @@ impl fmt::Display for SignError { MismatchedAlgoKey => write!(f, "signing algorithm and key type does not match"), NotEcdsa => write!(f, "attempted to ECDSA sign an non-ECDSA input"), NotWpkh => write!(f, "the scriptPubkey is not a P2WPKH script"), - SegwitV0Sighash(ref e) => write_err!(f, "segwit v0 sighash"; e), + SegwitV0Sighash(ref e) => write_err!(f, "SegWit v0 sighash"; e), P2wpkhSighash(ref e) => write_err!(f, "p2wpkh sighash"; e), TaprootError(ref e) => write_err!(f, "Taproot sighash"; e), UnknownOutputType => write!(f, "unable to determine the output type"),