From ebf2bc70f7841c5e98b7ee88b4359c63017f22ef Mon Sep 17 00:00:00 2001
From: Carsten Otto <git@c-otto.de>
Date: Wed, 25 May 2022 20:47:24 +0200
Subject: [PATCH] allow amounts with non-0 millisat parts

---
 .../ui/dto/BalanceInformationModel.java       | 12 ++++++------
 .../ui/dto/BalanceInformationModelTest.java   | 19 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ui/src/main/java/de/cotto/lndmanagej/ui/dto/BalanceInformationModel.java b/ui/src/main/java/de/cotto/lndmanagej/ui/dto/BalanceInformationModel.java
index 3f57d30b..f49be485 100644
--- a/ui/src/main/java/de/cotto/lndmanagej/ui/dto/BalanceInformationModel.java
+++ b/ui/src/main/java/de/cotto/lndmanagej/ui/dto/BalanceInformationModel.java
@@ -19,12 +19,12 @@ public record BalanceInformationModel(
 
     public static BalanceInformationModel createFromModel(BalanceInformation balanceInformation) {
         return new BalanceInformationModel(
-                balanceInformation.localBalance().satoshis(),
-                balanceInformation.localReserve().satoshis(),
-                balanceInformation.localAvailable().satoshis(),
-                balanceInformation.remoteBalance().satoshis(),
-                balanceInformation.remoteReserve().satoshis(),
-                balanceInformation.remoteAvailable().satoshis()
+                balanceInformation.localBalance().milliSatoshis() / 1_000,
+                balanceInformation.localReserve().milliSatoshis() / 1_000,
+                balanceInformation.localAvailable().milliSatoshis() / 1_000,
+                balanceInformation.remoteBalance().milliSatoshis() / 1_000,
+                balanceInformation.remoteReserve().milliSatoshis() / 1_000,
+                balanceInformation.remoteAvailable().milliSatoshis() / 1_000
         );
     }
 
diff --git a/ui/src/test/java/de/cotto/lndmanagej/ui/dto/BalanceInformationModelTest.java b/ui/src/test/java/de/cotto/lndmanagej/ui/dto/BalanceInformationModelTest.java
index f044ab1f..c275d1ee 100644
--- a/ui/src/test/java/de/cotto/lndmanagej/ui/dto/BalanceInformationModelTest.java
+++ b/ui/src/test/java/de/cotto/lndmanagej/ui/dto/BalanceInformationModelTest.java
@@ -1,5 +1,7 @@
 package de.cotto.lndmanagej.ui.dto;
 
+import de.cotto.lndmanagej.model.BalanceInformation;
+import de.cotto.lndmanagej.model.Coins;
 import org.junit.jupiter.api.Test;
 
 import static de.cotto.lndmanagej.ui.dto.BalanceInformationModelFixture.BALANCE_INFORMATION_MODEL;
@@ -9,6 +11,21 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 class BalanceInformationModelTest {
 
+    @Test
+    void accepts_msat_amount() {
+        Coins coinsWithMilliSat = Coins.ofMilliSatoshis(1_234);
+        BalanceInformation model = new BalanceInformation(
+                coinsWithMilliSat,
+                coinsWithMilliSat,
+                coinsWithMilliSat,
+                coinsWithMilliSat,
+                coinsWithMilliSat,
+                coinsWithMilliSat
+        );
+        BalanceInformationModel balanceInformation = BalanceInformationModel.createFromModel(model);
+        assertThat(balanceInformation.getRoutableCapacity()).isEqualTo(2);
+    }
+
     @Test
     void routableCapacity() {
         assertThat(BALANCE_INFORMATION_MODEL.getRoutableCapacity()).isEqualTo(1123L);
@@ -45,4 +62,4 @@ class BalanceInformationModelTest {
     void outboundPercentageLabel_belowTen_empty() {
         assertThat(LOW_LOCAL_MODEL.getOutboundPercentageLabel()).isEmpty();
     }
-}
\ No newline at end of file
+}