fix sat and msat conversion

utxostack · Oct 16, 2024 · 4e78e49 · 4e78e49
1 parent 2f11875
commit 4e78e49
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/mutiny-core/src/node.rs b/mutiny-core/src/node.rs
@@ -1596,6 +1596,7 @@ impl<S: MutinyStorage> Node<S> {
             .into_iter()
             .map(|b| b.claimable_amount_satoshis())
             .sum::<u64>()
+            * 1000
             < send_msats
         {
             // Channels exist but not enough capacity
@@ -1669,7 +1670,8 @@ impl<S: MutinyStorage> Node<S> {
                     .get_claimable_balances(&[])
                     .into_iter()
                     .map(|b| b.claimable_amount_satoshis())
-                    .sum();
+                    .sum::<u64>()
+                    * 1000;
                 log_debug!(
                     self.logger,
                     "current channel details: {:?}",
@@ -1821,6 +1823,7 @@ impl<S: MutinyStorage> Node<S> {
             .into_iter()
             .map(|b| b.claimable_amount_satoshis())
             .sum::<u64>()
+            * 1000
             < amt_msats
         {
             // Channels exist but not enough capacity
@@ -1921,7 +1924,8 @@ impl<S: MutinyStorage> Node<S> {
                     .get_claimable_balances(&[])
                     .into_iter()
                     .map(|b| b.claimable_amount_satoshis())
-                    .sum();
+                    .sum::<u64>()
+                    * 1000;
                 Err(map_sending_failure(
                     error,
                     amt_msats,

diff --git a/mutiny-core/src/nodemanager.rs b/mutiny-core/src/nodemanager.rs
@@ -964,7 +964,7 @@ impl<S: MutinyStorage> NodeManager<S> {
         };
 
         let nodes = self.nodes.read().await;
-        let lightning_msats: u64 = nodes
+        let lightning_sats: u64 = nodes
             .iter()
             .flat_map(|(_, n)| {
                 n.chain_monitor
@@ -999,7 +999,7 @@ impl<S: MutinyStorage> NodeManager<S> {
         Ok(NodeBalance {
             confirmed: (onchain.confirmed + onchain.trusted_pending).to_sat(),
             unconfirmed: (onchain.untrusted_pending + onchain.immature).to_sat(),
-            lightning: lightning_msats / 1_000,
+            lightning: lightning_sats,
             force_close,
         })
     }