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

Remove default impl from transaction version 

There is no logical default for the transaction version number, there is
only pre-bip68 (v1) and post-bip68 (v2). Uses should specify the version
they want not rely on us making the choice.

(I originally added this impl to support testing, this was in hindsight
the wrong thing to do, props to Sanket for noticing.)
This commit is contained in:
Tobin C. Harding 2023-09-25 05:51:24 +10:00
parent 72a7280d7d
commit f31fb08651
No known key found for this signature in database
GPG Key ID: 40BF9E4C269D6607
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitcoin/src/blockdata/transaction.rs
View File

@ -980,10 +980,6 @@ impl Version {
pub fn is_standard(&self) -> bool { *self == Version::ONE || *self == Version::TWO } pub fn is_standard(&self) -> bool { *self == Version::ONE || *self == Version::TWO }
} }
impl Default for Version {
fn default() -> Version { Version::TWO }
}
impl Encodable for Version { impl Encodable for Version {
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> { fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
self.0.consensus_encode(w) self.0.consensus_encode(w)
@ -1942,7 +1938,7 @@ mod tests {
]; ];
let empty_transaction_weight = Transaction { let empty_transaction_weight = Transaction {
version: Version::default(), version: Version::TWO,
lock_time: absolute::LockTime::ZERO, lock_time: absolute::LockTime::ZERO,
input: vec![], input: vec![],
output: vec![], output: vec![],

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

@ -1463,7 +1463,7 @@ mod tests {
#[rustfmt::skip] // Allow long function call `taproot_signature_hash`. #[rustfmt::skip] // Allow long function call `taproot_signature_hash`.
fn test_sighash_errors() { fn test_sighash_errors() {
let dumb_tx = Transaction { let dumb_tx = Transaction {
version: transaction::Version::default(), version: transaction::Version::TWO,
lock_time: absolute::LockTime::ZERO, lock_time: absolute::LockTime::ZERO,
input: vec![TxIn::default()], input: vec![TxIn::default()],
output: vec![], output: vec![],