X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Ftransaction_utils.rs;h=db1460283324c9cedb247cbb7758e76230a5e289;hb=2e33acbd9c5ebd605829859a982822df6e0f1723;hp=4d444d7c2aba29f20aa8ad6bee4e4483e008024d;hpb=22398853c97966f42c709669fff3c63486d82993;p=rust-lightning diff --git a/lightning/src/util/transaction_utils.rs b/lightning/src/util/transaction_utils.rs index 4d444d7c..db146028 100644 --- a/lightning/src/util/transaction_utils.rs +++ b/lightning/src/util/transaction_utils.rs @@ -12,10 +12,10 @@ use bitcoin::blockdata::script::Script; use bitcoin::consensus::Encodable; use bitcoin::consensus::encode::VarInt; -use ln::msgs::MAX_VALUE_MSAT; +use crate::ln::msgs::MAX_VALUE_MSAT; -use prelude::*; -use io_extras::sink; +use crate::prelude::*; +use crate::io_extras::sink; use core::cmp::Ordering; pub fn sort_outputs Ordering>(outputs: &mut Vec<(TxOut, T)>, tie_breaker: C) { @@ -50,13 +50,13 @@ pub(crate) fn maybe_add_change_output(tx: &mut Transaction, input_value: u64, wi value: 0, }; let change_len = change_output.consensus_encode(&mut sink()).unwrap(); - let starting_weight = tx.get_weight() + WITNESS_FLAG_BYTES as usize + witness_max_weight; + let starting_weight = tx.weight() + WITNESS_FLAG_BYTES as usize + witness_max_weight; let mut weight_with_change: i64 = starting_weight as i64 + change_len as i64 * 4; // Include any extra bytes required to push an extra output. weight_with_change += (VarInt(tx.output.len() as u64 + 1).len() - VarInt(tx.output.len() as u64).len()) as i64 * 4; // When calculating weight, add two for the flag bytes let change_value: i64 = (input_value - output_value) as i64 - weight_with_change * feerate_sat_per_1000_weight as i64 / 1000; - if change_value >= dust_value.as_sat() as i64 { + if change_value >= dust_value.to_sat() as i64 { change_output.value = change_value as u64; tx.output.push(change_output); Ok(weight_with_change as usize) @@ -75,8 +75,8 @@ mod tests { use bitcoin::blockdata::script::{Script, Builder}; use bitcoin::hash_types::{PubkeyHash, Txid}; - use bitcoin::hashes::sha256d::Hash as Sha256dHash; use bitcoin::hashes::Hash; + use bitcoin::{PackedLockTime, Sequence, Witness}; use hex::decode; @@ -214,7 +214,7 @@ mod tests { #[test] fn test_tx_value_overrun() { // If we have a bogus input amount or outputs valued more than inputs, we should fail - let mut tx = Transaction { version: 2, lock_time: 0, input: Vec::new(), output: vec![TxOut { + let mut tx = Transaction { version: 2, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: vec![TxOut { script_pubkey: Script::new(), value: 1000 }] }; assert!(maybe_add_change_output(&mut tx, 21_000_000_0000_0001, 0, 253, Script::new()).is_err()); @@ -225,12 +225,12 @@ mod tests { #[test] fn test_tx_change_edge() { // Check that we never add dust outputs - let mut tx = Transaction { version: 2, lock_time: 0, input: Vec::new(), output: Vec::new() }; + let mut tx = Transaction { version: 2, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() }; let orig_wtxid = tx.wtxid(); let output_spk = Script::new_p2pkh(&PubkeyHash::hash(&[0; 0])); - assert_eq!(output_spk.dust_value().as_sat(), 546); + assert_eq!(output_spk.dust_value().to_sat(), 546); // 9 sats isn't enough to pay fee on a dummy transaction... - assert_eq!(tx.get_weight() as u64, 40); // ie 10 vbytes + assert_eq!(tx.weight() as u64, 40); // ie 10 vbytes assert!(maybe_add_change_output(&mut tx, 9, 0, 250, output_spk.clone()).is_err()); assert_eq!(tx.wtxid(), orig_wtxid); // Failure doesn't change the transaction // but 10-564 is, just not enough to add a change output... @@ -250,7 +250,7 @@ mod tests { assert_eq!(tx.output.len(), 1); assert_eq!(tx.output[0].value, 546); assert_eq!(tx.output[0].script_pubkey, output_spk); - assert_eq!(tx.get_weight() / 4, 590-546); // New weight is exactly the fee we wanted. + assert_eq!(tx.weight() / 4, 590-546); // New weight is exactly the fee we wanted. tx.output.pop(); assert_eq!(tx.wtxid(), orig_wtxid); // The only change is the addition of one output. @@ -259,16 +259,16 @@ mod tests { #[test] fn test_tx_extra_outputs() { // Check that we correctly handle existing outputs - let mut tx = Transaction { version: 2, lock_time: 0, input: vec![TxIn { - previous_output: OutPoint::new(Txid::from_hash(Sha256dHash::default()), 0), script_sig: Script::new(), witness: Vec::new(), sequence: 0, + let mut tx = Transaction { version: 2, lock_time: PackedLockTime::ZERO, input: vec![TxIn { + previous_output: OutPoint::new(Txid::all_zeros(), 0), script_sig: Script::new(), witness: Witness::new(), sequence: Sequence::ZERO, }], output: vec![TxOut { script_pubkey: Builder::new().push_int(1).into_script(), value: 1000 }] }; let orig_wtxid = tx.wtxid(); - let orig_weight = tx.get_weight(); + let orig_weight = tx.weight(); assert_eq!(orig_weight / 4, 61); - assert_eq!(Builder::new().push_int(2).into_script().dust_value().as_sat(), 474); + assert_eq!(Builder::new().push_int(2).into_script().dust_value().to_sat(), 474); // Input value of the output value + fee - 1 should fail: assert!(maybe_add_change_output(&mut tx, 1000 + 61 + 100 - 1, 400, 250, Builder::new().push_int(2).into_script()).is_err()); @@ -284,7 +284,7 @@ mod tests { assert_eq!(tx.output.len(), 2); assert_eq!(tx.output[1].value, 474); assert_eq!(tx.output[1].script_pubkey, Builder::new().push_int(2).into_script()); - assert_eq!(tx.get_weight() - orig_weight, 40); // Weight difference matches what we had to add above + assert_eq!(tx.weight() - orig_weight, 40); // Weight difference matches what we had to add above tx.output.pop(); assert_eq!(tx.wtxid(), orig_wtxid); // The only change is the addition of one output. }