X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Ftransaction_utils.rs;h=1ac9f5eb5c128d31c1b856bfff21b65932e08cbf;hb=9a5c9b3680dccd45986948c5776bd384b4f89dd7;hp=34d0fb275764a339ce13c9b50bef0eaebda43683;hpb=c7e198e6fca8fc31e004b51368978b109c1caff6;p=rust-lightning diff --git a/lightning/src/util/transaction_utils.rs b/lightning/src/util/transaction_utils.rs index 34d0fb27..1ac9f5eb 100644 --- a/lightning/src/util/transaction_utils.rs +++ b/lightning/src/util/transaction_utils.rs @@ -14,6 +14,8 @@ use bitcoin::consensus::encode::VarInt; use ln::msgs::MAX_VALUE_MSAT; +use prelude::*; +use io_extras::sink; use core::cmp::Ordering; pub fn sort_outputs Ordering>(outputs: &mut Vec<(TxOut, T)>, tie_breaker: C) { @@ -55,7 +57,7 @@ pub(crate) fn maybe_add_change_output(tx: &mut Transaction, input_value: u64, wi script_pubkey: change_destination_script, value: 0, }; - let change_len = change_output.consensus_encode(&mut std::io::sink()).unwrap(); + let change_len = change_output.consensus_encode(&mut sink()).unwrap(); let mut weight_with_change: i64 = tx.get_weight() as i64 + 2 + witness_max_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; @@ -83,6 +85,8 @@ mod tests { use hex::decode; + use alloc::vec; + #[test] fn sort_output_by_value() { let txout1 = TxOut {