From 0c9c0716a4651907636dfcf91958ba08b0251d31 Mon Sep 17 00:00:00 2001
From: LLFourn <lloyd.fourn@gmail.com>
Date: Tue, 29 Dec 2020 16:36:35 +1100
Subject: [PATCH] [wallet] Fix details.fees being wrong when change is dust

---
 src/wallet/mod.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/wallet/mod.rs b/src/wallet/mod.rs
index 99e5b05c..c9b4a5be 100644
--- a/src/wallet/mod.rs
+++ b/src/wallet/mod.rs
@@ -511,8 +511,8 @@ where
                 return Err(Error::InsufficientFunds); // TODO: or OutputBelowDustLimit?
             }
             Some(_) if change_val.is_dust() => {
-                // skip the change output because it's dust, this adds up to the fees
-                fee_amount += selected_amount - outgoing;
+                // skip the change output because it's dust -- just include it in the fee.
+                fee_amount += change_val;
             }
             Some(mut change_output) => {
                 change_output.value = change_val;
@@ -1964,7 +1964,7 @@ mod test {
     fn test_create_tx_skip_change_dust() {
         let (wallet, _, _) = get_funded_wallet(get_test_wpkh());
         let addr = wallet.get_new_address().unwrap();
-        let (psbt, _) = wallet
+        let (psbt, details) = wallet
             .create_tx(TxBuilder::with_recipients(vec![(
                 addr.script_pubkey(),
                 49_800,
@@ -1973,6 +1973,7 @@ mod test {
 
         assert_eq!(psbt.global.unsigned_tx.output.len(), 1);
         assert_eq!(psbt.global.unsigned_tx.output[0].value, 49_800);
+        assert_eq!(details.fees, 200);
     }
 
     #[test]