Skip to content

Commit 2167038

Browse files
committed
Merge rust-bitcoin#5049: chore: fix inconsistent comments and typos
4732fdb docs: fix typo (radik878) 5cd1201 docs: fix inconsistent comment (radik878) 94e598b docs: fix inconsistance in comment (radik878) Pull request description: Fixed some mismatches and typos in code comments ACKs for top commit: tcharding: ACK 4732fdb apoelstra: ACK 4732fdb; successfully ran local tests Tree-SHA512: 3738403d13f0bcdbda44248e600ea905aa80fe57ad049e273bf9d430d6a3a9e7a72256db61c4a9e234de4db669693442c0bcaadb073974a798cd2dcdf3c775a4
2 parents 940bf83 + 4732fdb commit 2167038

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

bitcoin/src/psbt/map/input.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const PSBT_IN_HASH256: u64 = 0x0d;
5151
const PSBT_IN_TAP_KEY_SIG: u64 = 0x13;
5252
/// Type: Taproot Signature in Script Spend PSBT_IN_TAP_SCRIPT_SIG = 0x14
5353
const PSBT_IN_TAP_SCRIPT_SIG: u64 = 0x14;
54-
/// Type: Taproot Leaf Script PSBT_IN_TAP_LEAF_SCRIPT = 0x14
54+
/// Type: Taproot Leaf Script PSBT_IN_TAP_LEAF_SCRIPT = 0x15
5555
const PSBT_IN_TAP_LEAF_SCRIPT: u64 = 0x15;
5656
/// Type: Taproot Key BIP-0032 Derivation Path PSBT_IN_TAP_BIP32_DERIVATION = 0x16
5757
const PSBT_IN_TAP_BIP32_DERIVATION: u64 = 0x16;

bitcoin/src/psbt/map/output.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const PSBT_OUT_TAP_TREE: u64 = 0x06;
2222
const PSBT_OUT_TAP_BIP32_DERIVATION: u64 = 0x07;
2323
/// Type: MuSig2 Public Keys Participating in Aggregate Output PSBT_OUT_MUSIG2_PARTICIPANT_PUBKEYS = 0x08
2424
const PSBT_OUT_MUSIG2_PARTICIPANT_PUBKEYS: u64 = 0x08;
25-
/// Type: Proprietary Use Type PSBT_IN_PROPRIETARY = 0xFC
25+
/// Type: Proprietary Use Type PSBT_OUT_PROPRIETARY = 0xFC
2626
const PSBT_OUT_PROPRIETARY: u64 = 0xFC;
2727

2828
/// A key-value map for an output of the corresponding index in the unsigned

bitcoin/src/psbt/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ impl Psbt {
671671
Ok(output_type.signing_algorithm())
672672
}
673673

674-
/// Returns the [`OutputType`] of the spend utxo for this PBST's input at `input_index`.
674+
/// Returns the [`OutputType`] of the spend utxo for this PSBT's input at `input_index`.
675675
fn output_type(&self, input_index: usize) -> Result<OutputType, SignError> {
676676
let input = self.checked_input(input_index)?;
677677
let utxo = self.spend_utxo(input_index)?;
@@ -1088,7 +1088,7 @@ impl fmt::Display for SignError {
10881088
match *self {
10891089
IndexOutOfBounds(ref e) => write_err!(f, "index out of bounds"; e),
10901090
InvalidSighashType => write!(f, "invalid sighash type"),
1091-
MissingInputUtxo => write!(f, "missing input utxo in PBST"),
1091+
MissingInputUtxo => write!(f, "missing input utxo in PSBT"),
10921092
MissingRedeemScript => write!(f, "missing redeem script"),
10931093
MissingSpendUtxo => write!(f, "missing spend utxo in PSBT"),
10941094
MissingWitnessScript => write!(f, "missing witness script"),
@@ -1213,14 +1213,14 @@ pub enum IndexOutOfBoundsError {
12131213
Inputs {
12141214
/// Attempted index access.
12151215
index: usize,
1216-
/// Length of the PBST inputs vector.
1216+
/// Length of the PSBT inputs vector.
12171217
length: usize,
12181218
},
12191219
/// The index is out of bounds for the `psbt.unsigned_tx.input` vector.
12201220
TxInput {
12211221
/// Attempted index access.
12221222
index: usize,
1223-
/// Length of the PBST's unsigned transaction input vector.
1223+
/// Length of the PSBT's unsigned transaction input vector.
12241224
length: usize,
12251225
},
12261226
}

0 commit comments

Comments
 (0)