Merge pull request #1004 from TheBlueMatt/2021-07-forward-event

[rust-lightning] / lightning / src / util / transaction_utils.rs

diff --git a/lightning/src/util/transaction_utils.rs b/lightning/src/util/transaction_utils.rs
index 34d0fb275764a339ce13c9b50bef0eaebda43683..1ac9f5eb5c128d31c1b856bfff21b65932e08cbf 100644 (file)
--- 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<T, C : Fn(&T, &T) -> 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 {