milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge rust-bitcoin/rust-bitcoin#3996: Automated nightly rustfmt (2025-02-02) 

282bc14d6e 2025-02-02 automated rustfmt nightly (Fmt Bot)

Pull request description:

  Automated nightly `rustfmt` changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action

ACKs for top commit:
  apoelstra:
    ACK 282bc14d6e38ec78b0df01b1169b7ed42a2265cf; successfully ran local tests
  tcharding:
    ACK 282bc14d6e

Tree-SHA512: 88771b5ed72cd357e1bf0bd12d2bbe12b2bb469e667172c8ab4d7beeab46df2270471a586e9b10d7296ef62fc92f7932e4fa7da5905136a7055d42902d580ee2
This commit is contained in:
merge-script 2025-02-02 23:48:53 +00:00
parent 917149998b 282bc14d6e
commit f81d10b2b6
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bitcoin/src/crypto/sighash.rs
View File

@ -994,7 +994,7 @@ impl<R: Borrow<Transaction>> SighashCache<R> {
match sighash {
EcdsaSighashType::All => {
self_.output.consensus_encode(writer)?;
},
}
EcdsaSighashType::Single => {
// sign all outputs up to and including this one, but erase
// all of them except for this one
@ -1002,13 +1002,14 @@ impl<R: Borrow<Transaction>> SighashCache<R> {
writer.emit_compact_size(count + 1)?;
for _ in 0..count {
// consensus encoding of the "NULL txout" - max amount, empty script_pubkey
writer.write_all(&[0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00])?;
writer
.write_all(&[0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00])?;
}
self_.output[count].consensus_encode(writer)?;
},
}
EcdsaSighashType::None => {
writer.emit_compact_size(0u8)?;
},
}
_ => unreachable!(),
};
self_.lock_time.consensus_encode(writer)?;

1
primitives/src/locktime/absolute.rs
View File

@ -516,7 +516,6 @@ mod tests {
assert!(lock_by_time.is_satisfied_by(height, time_same));
assert!(lock_by_time.is_satisfied_by(height, time_after));
assert!(!lock_by_time.is_satisfied_by(height, time_before));
}
#[test]

1
primitives/src/script/owned.rs
View File

@ -95,7 +95,6 @@ impl<'a> Arbitrary<'a> for ScriptBuf {
}
}
#[cfg(test)]
mod tests {
use super::*;