compute channel details in service

lots of refactoring, changes API
2026-01-22 07:24:23 +01:00 · 2021-12-17 10:31:59 +01:00
parent 690960afc4
commit 71d12e52bb
40 changed files with 797 additions and 730 deletions
--- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelControllerIT.java
+++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelControllerIT.java
@@ -3,16 +3,12 @@ package de.cotto.lndmanagej.controller;
 import de.cotto.lndmanagej.model.ChannelIdResolver;
 import de.cotto.lndmanagej.model.Coins;
 import de.cotto.lndmanagej.model.FeeReport;
-import de.cotto.lndmanagej.model.OffChainCosts;
-import de.cotto.lndmanagej.model.OnChainCosts;
 import de.cotto.lndmanagej.service.BalanceService;
+import de.cotto.lndmanagej.service.ChannelDetailsService;
 import de.cotto.lndmanagej.service.ChannelService;
 import de.cotto.lndmanagej.service.FeeService;
 import de.cotto.lndmanagej.service.NodeService;
-import de.cotto.lndmanagej.service.OffChainCostService;
-import de.cotto.lndmanagej.service.OnChainCostService;
 import de.cotto.lndmanagej.service.PolicyService;
-import de.cotto.lndmanagej.service.RebalanceService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
@@ -22,6 +18,8 @@ import org.springframework.test.web.servlet.MockMvc;
 import java.util.Optional;

 import static de.cotto.lndmanagej.model.BalanceInformationFixtures.BALANCE_INFORMATION_2;
+import static de.cotto.lndmanagej.model.ChannelDetailsFixtures.CHANNEL_DETAILS;
+import static de.cotto.lndmanagej.model.ChannelDetailsFixtures.CHANNEL_DETAILS_CLOSED;
 import static de.cotto.lndmanagej.model.ChannelFixtures.CAPACITY;
 import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID;
 import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_2;
@@ -36,9 +34,8 @@ import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.TOTAL_RECEIVED;
 import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.TOTAL_RECEIVED_2;
 import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.TOTAL_SENT;
 import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.TOTAL_SENT_2;
+import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS;
 import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS_2;
-import static de.cotto.lndmanagej.model.OffChainCostsFixtures.OFF_CHAIN_COSTS;
-import static de.cotto.lndmanagej.model.OnChainCostsFixtures.ON_CHAIN_COSTS;
 import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES;
 import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_2;
 import static org.hamcrest.core.Is.is;
@@ -67,12 +64,6 @@ class ChannelControllerIT {
    @SuppressWarnings("unused")
    private ChannelIdResolver channelIdResolver;

-    @MockBean
-    private OnChainCostService onChainCostService;
-
-    @MockBean
-    private OffChainCostService offChainCostService;
-
    @MockBean
    private BalanceService balanceService;

@@ -83,7 +74,7 @@ class ChannelControllerIT {
    private FeeService feeService;

    @MockBean
-    private RebalanceService rebalanceService;
+    private ChannelDetailsService channelDetailsService;

    @Test
    void getBasicInformation_not_found() throws Exception {
@@ -131,22 +122,15 @@ class ChannelControllerIT {

    @Test
    void getChannelDetails() throws Exception {
-        when(policyService.getPolicies(CHANNEL_ID)).thenReturn(POLICIES);
-        when(nodeService.getAlias(PUBKEY_2)).thenReturn(ALIAS_2);
        when(channelService.getLocalChannel(CHANNEL_ID)).thenReturn(Optional.of(LOCAL_OPEN_CHANNEL_PRIVATE));
-        when(onChainCostService.getOnChainCostsForChannelId(CHANNEL_ID)).thenReturn(ON_CHAIN_COSTS);
-        when(offChainCostService.getOffChainCostsForChannel(CHANNEL_ID)).thenReturn(OFF_CHAIN_COSTS);
-        when(balanceService.getBalanceInformation(CHANNEL_ID)).thenReturn(Optional.of(BALANCE_INFORMATION_2));
-        when(feeService.getFeeReportForChannel(CHANNEL_ID)).thenReturn(FEE_REPORT);
-        when(rebalanceService.getRebalanceAmountFromChannel(CHANNEL_ID)).thenReturn(Coins.ofMilliSatoshis(1));
-        when(rebalanceService.getRebalanceAmountToChannel(CHANNEL_ID)).thenReturn(Coins.ofMilliSatoshis(2));
+        when(channelDetailsService.getDetails(LOCAL_OPEN_CHANNEL_PRIVATE)).thenReturn(CHANNEL_DETAILS);
        mockMvc.perform(get(DETAILS_PREFIX))
                .andExpect(jsonPath("$.channelIdShort", is(String.valueOf(CHANNEL_ID.getShortChannelId()))))
                .andExpect(jsonPath("$.channelIdCompact", is(CHANNEL_ID.getCompactForm())))
                .andExpect(jsonPath("$.channelIdCompactLnd", is(CHANNEL_ID.getCompactFormLnd())))
                .andExpect(jsonPath("$.channelPoint", is(CHANNEL_POINT.toString())))
                .andExpect(jsonPath("$.remotePubkey", is(PUBKEY_2.toString())))
-                .andExpect(jsonPath("$.remoteAlias", is(ALIAS_2)))
+                .andExpect(jsonPath("$.remoteAlias", is(ALIAS)))
                .andExpect(jsonPath("$.capacity", is(String.valueOf(CAPACITY.satoshis()))))
                .andExpect(jsonPath("$.totalSent", is(String.valueOf(TOTAL_SENT.satoshis()))))
                .andExpect(jsonPath("$.totalReceived", is(String.valueOf(TOTAL_RECEIVED.satoshis()))))
@@ -159,16 +143,16 @@ class ChannelControllerIT {
                .andExpect(jsonPath("$.onChainCosts.openCosts", is("1000")))
                .andExpect(jsonPath("$.onChainCosts.closeCosts", is("2000")))
                .andExpect(jsonPath("$.onChainCosts.sweepCosts", is("3000")))
-                .andExpect(jsonPath("$.offChainCosts.rebalanceSource", is("1000000")))
-                .andExpect(jsonPath("$.offChainCosts.rebalanceTarget", is("2000000")))
-                .andExpect(jsonPath("$.rebalanceSourceAmount", is("1")))
-                .andExpect(jsonPath("$.rebalanceTargetAmount", is("2")))
-                .andExpect(jsonPath("$.balance.localBalance", is("2000")))
-                .andExpect(jsonPath("$.balance.localReserve", is("200")))
-                .andExpect(jsonPath("$.balance.localAvailable", is("1800")))
-                .andExpect(jsonPath("$.balance.remoteBalance", is("223")))
-                .andExpect(jsonPath("$.balance.remoteReserve", is("20")))
-                .andExpect(jsonPath("$.balance.remoteAvailable", is("203")))
+                .andExpect(jsonPath("$.rebalanceReport.sourceCosts", is("1000000")))
+                .andExpect(jsonPath("$.rebalanceReport.sourceAmount", is("665000")))
+                .andExpect(jsonPath("$.rebalanceReport.targetCosts", is("2000000")))
+                .andExpect(jsonPath("$.rebalanceReport.targetAmount", is("991000")))
+                .andExpect(jsonPath("$.balance.localBalance", is("1000")))
+                .andExpect(jsonPath("$.balance.localReserve", is("100")))
+                .andExpect(jsonPath("$.balance.localAvailable", is("900")))
+                .andExpect(jsonPath("$.balance.remoteBalance", is("123")))
+                .andExpect(jsonPath("$.balance.remoteReserve", is("10")))
+                .andExpect(jsonPath("$.balance.remoteAvailable", is("113")))
                .andExpect(jsonPath("$.policies.local.enabled", is(false)))
                .andExpect(jsonPath("$.policies.remote.enabled", is(true)))
                .andExpect(jsonPath("$.policies.local.feeRatePpm", is(100)))
@@ -182,11 +166,7 @@ class ChannelControllerIT {
    @Test
    void getChannelDetails_closed_channel() throws Exception {
        when(channelService.getLocalChannel(CHANNEL_ID)).thenReturn(Optional.of(CLOSED_CHANNEL));
-        when(feeService.getFeeReportForChannel(CHANNEL_ID)).thenReturn(new FeeReport(Coins.NONE, Coins.NONE));
-        when(onChainCostService.getOnChainCostsForChannelId(CHANNEL_ID)).thenReturn(OnChainCosts.NONE);
-        when(offChainCostService.getOffChainCostsForChannel(CHANNEL_ID)).thenReturn(OffChainCosts.NONE);
-        when(rebalanceService.getRebalanceAmountFromChannel(CHANNEL_ID)).thenReturn(Coins.NONE);
-        when(rebalanceService.getRebalanceAmountToChannel(CHANNEL_ID)).thenReturn(Coins.NONE);
+        when(channelDetailsService.getDetails(CLOSED_CHANNEL)).thenReturn(CHANNEL_DETAILS_CLOSED);
        mockMvc.perform(get(DETAILS_PREFIX))
                .andExpect(jsonPath("$.closeDetails.initiator", is("REMOTE")))
                .andExpect(jsonPath("$.closeDetails.height", is(987_654)))
--- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java
+++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java
@@ -8,7 +8,6 @@ import de.cotto.lndmanagej.service.BalanceService;
 import de.cotto.lndmanagej.service.ChannelService;
 import de.cotto.lndmanagej.service.FeeService;
 import de.cotto.lndmanagej.service.NodeService;
-import de.cotto.lndmanagej.service.OffChainCostService;
 import de.cotto.lndmanagej.service.OnChainCostService;
 import de.cotto.lndmanagej.service.RebalanceService;
 import org.junit.jupiter.api.Test;
@@ -21,6 +20,7 @@ import java.util.List;
 import java.util.Set;

 import static de.cotto.lndmanagej.model.BalanceInformationFixtures.BALANCE_INFORMATION;
+import static de.cotto.lndmanagej.model.BalanceInformationFixtures.BALANCE_INFORMATION_2;
 import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID;
 import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_2;
 import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_3;
@@ -31,9 +31,9 @@ import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHAN
 import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_2;
 import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_3;
 import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS_2;
-import static de.cotto.lndmanagej.model.OffChainCostsFixtures.OFF_CHAIN_COSTS;
 import static de.cotto.lndmanagej.model.OnChainCostsFixtures.ON_CHAIN_COSTS;
 import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_2;
+import static de.cotto.lndmanagej.model.RebalanceReportFixtures.REBALANCE_REPORT;
 import static de.cotto.lndmanagej.model.WaitingCloseChannelFixtures.WAITING_CLOSE_CHANNEL;
 import static org.hamcrest.core.Is.is;
 import static org.mockito.Mockito.when;
@@ -58,9 +58,6 @@ class NodeControllerIT {
    @MockBean
    private OnChainCostService onChainCostService;

-    @MockBean
-    private OffChainCostService offChainCostService;
-
    @MockBean
    @SuppressWarnings("unused")
    private ChannelIdResolver channelIdResolver;
@@ -89,11 +86,9 @@ class NodeControllerIT {
        when(channelService.getWaitingCloseChannelsWith(PUBKEY_2)).thenReturn(Set.of(WAITING_CLOSE_CHANNEL));
        when(channelService.getForceClosingChannelsWith(PUBKEY_2)).thenReturn(Set.of(FORCE_CLOSING_CHANNEL_2));
        when(onChainCostService.getOnChainCostsForPeer(PUBKEY_2)).thenReturn(ON_CHAIN_COSTS);
-        when(offChainCostService.getOffChainCostsForPeer(PUBKEY_2)).thenReturn(OFF_CHAIN_COSTS);
-        when(balanceService.getBalanceInformationForPeer(PUBKEY_2)).thenReturn(BALANCE_INFORMATION);
+        when(balanceService.getBalanceInformationForPeer(PUBKEY_2)).thenReturn(BALANCE_INFORMATION_2);
        when(feeService.getFeeReportForPeer(PUBKEY_2)).thenReturn(FEE_REPORT);
-        when(rebalanceService.getRebalanceAmountFromPeer(PUBKEY_2)).thenReturn(Coins.ofMilliSatoshis(1));
-        when(rebalanceService.getRebalanceAmountToPeer(PUBKEY_2)).thenReturn(Coins.ofMilliSatoshis(2));
+        when(rebalanceService.getReportForPeer(PUBKEY_2)).thenReturn(REBALANCE_REPORT);
        List<String> channelIds = List.of(CHANNEL_ID.toString(), CHANNEL_ID_2.toString());
        List<String> closedChannelIds = List.of(CHANNEL_ID.toString(), CHANNEL_ID_3.toString());
        List<String> waitingCloseChannelIds = List.of(CHANNEL_ID.toString());
@@ -105,21 +100,21 @@ class NodeControllerIT {
                .andExpect(jsonPath("$.closedChannels", is(closedChannelIds)))
                .andExpect(jsonPath("$.waitingCloseChannels", is(waitingCloseChannelIds)))
                .andExpect(jsonPath("$.pendingForceClosingChannels", is(forceClosingChannelIds)))
-                .andExpect(jsonPath("$.offChainCosts.rebalanceSource", is("1000000")))
-                .andExpect(jsonPath("$.offChainCosts.rebalanceTarget", is("2000000")))
-                .andExpect(jsonPath("$.balance.localBalance", is("1000")))
-                .andExpect(jsonPath("$.balance.localReserve", is("100")))
-                .andExpect(jsonPath("$.balance.localAvailable", is("900")))
-                .andExpect(jsonPath("$.balance.remoteBalance", is("123")))
-                .andExpect(jsonPath("$.balance.remoteReserve", is("10")))
-                .andExpect(jsonPath("$.balance.remoteAvailable", is("113")))
+                .andExpect(jsonPath("$.rebalanceReport.sourceCosts", is("1000000")))
+                .andExpect(jsonPath("$.rebalanceReport.targetCosts", is("2000000")))
+                .andExpect(jsonPath("$.rebalanceReport.sourceAmount", is("665000")))
+                .andExpect(jsonPath("$.rebalanceReport.targetAmount", is("991000")))
+                .andExpect(jsonPath("$.balance.localBalance", is("2000")))
+                .andExpect(jsonPath("$.balance.localReserve", is("200")))
+                .andExpect(jsonPath("$.balance.localAvailable", is("1800")))
+                .andExpect(jsonPath("$.balance.remoteBalance", is("223")))
+                .andExpect(jsonPath("$.balance.remoteReserve", is("20")))
+                .andExpect(jsonPath("$.balance.remoteAvailable", is("203")))
                .andExpect(jsonPath("$.feeReport.earned", is("1234")))
                .andExpect(jsonPath("$.feeReport.sourced", is("567")))
                .andExpect(jsonPath("$.onChainCosts.openCosts", is("1000")))
                .andExpect(jsonPath("$.onChainCosts.closeCosts", is("2000")))
                .andExpect(jsonPath("$.onChainCosts.sweepCosts", is("3000")))
-                .andExpect(jsonPath("$.rebalanceSourceAmount", is("1")))
-                .andExpect(jsonPath("$.rebalanceTargetAmount", is("2")))
                .andExpect(jsonPath("$.online", is(true)));
    }

--- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/RebalancesControllerIT.java
+++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/RebalancesControllerIT.java
@@ -2,7 +2,6 @@ package de.cotto.lndmanagej.controller;

 import de.cotto.lndmanagej.model.ChannelIdResolver;
 import de.cotto.lndmanagej.model.Coins;
-import de.cotto.lndmanagej.service.OffChainCostService;
 import de.cotto.lndmanagej.service.RebalanceService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,64 +27,61 @@ class RebalancesControllerIT {
    @SuppressWarnings("unused")
    private ChannelIdResolver channelIdResolver;

-    @MockBean
-    private OffChainCostService offChainCostService;
-
    @MockBean
    private RebalanceService rebalanceService;

    @Test
    void getRebalanceSourceCostsForChannel() throws Exception {
-        when(offChainCostService.getRebalanceSourceCostsForChannel(CHANNEL_ID)).thenReturn(Coins.ofMilliSatoshis(123));
+        when(rebalanceService.getSourceCostsForChannel(CHANNEL_ID)).thenReturn(Coins.ofMilliSatoshis(123));
        mockMvc.perform(get(CHANNEL_PREFIX + "/rebalance-source-costs/"))
                .andExpect(content().string("123"));
    }

    @Test
    void getRebalanceSourceAmountForChannel() throws Exception {
-        when(rebalanceService.getRebalanceAmountFromChannel(CHANNEL_ID)).thenReturn(Coins.ofMilliSatoshis(456));
+        when(rebalanceService.getAmountFromChannel(CHANNEL_ID)).thenReturn(Coins.ofMilliSatoshis(456));
        mockMvc.perform(get(CHANNEL_PREFIX + "/rebalance-source-amount/"))
                .andExpect(content().string("456"));
    }

    @Test
    void getRebalanceSourceCostsForPeer() throws Exception {
-        when(offChainCostService.getRebalanceSourceCostsForPeer(PUBKEY)).thenReturn(Coins.ofMilliSatoshis(124));
+        when(rebalanceService.getSourceCostsForPeer(PUBKEY)).thenReturn(Coins.ofMilliSatoshis(124));
        mockMvc.perform(get(NODE_PREFIX + "/rebalance-source-costs/"))
                .andExpect(content().string("124"));
    }

    @Test
    void getRebalanceSourceAmountForPeer() throws Exception {
-        when(rebalanceService.getRebalanceAmountFromPeer(PUBKEY)).thenReturn(Coins.ofMilliSatoshis(666));
+        when(rebalanceService.getAmountFromPeer(PUBKEY)).thenReturn(Coins.ofMilliSatoshis(666));
        mockMvc.perform(get(NODE_PREFIX + "/rebalance-source-amount/"))
                .andExpect(content().string("666"));
    }

    @Test
    void getRebalanceTargetCostsForChannel() throws Exception {
-        when(offChainCostService.getRebalanceTargetCostsForChannel(CHANNEL_ID)).thenReturn(Coins.ofMilliSatoshis(125));
+        when(rebalanceService.getTargetCostsForChannel(CHANNEL_ID)).thenReturn(Coins.ofMilliSatoshis(125));
        mockMvc.perform(get(CHANNEL_PREFIX + "/rebalance-target-costs/"))
                .andExpect(content().string("125"));
    }

    @Test
    void getRebalanceTargetAmountForChannel() throws Exception {
-        when(rebalanceService.getRebalanceAmountToChannel(CHANNEL_ID)).thenReturn(Coins.ofMilliSatoshis(7777));
+        when(rebalanceService.getAmountToChannel(CHANNEL_ID)).thenReturn(Coins.ofMilliSatoshis(7777));
        mockMvc.perform(get(CHANNEL_PREFIX + "/rebalance-target-amount/"))
                .andExpect(content().string("7777"));
    }

    @Test
    void getRebalanceTargetCostsForPeer() throws Exception {
-        when(offChainCostService.getRebalanceTargetCostsForPeer(PUBKEY)).thenReturn(Coins.ofMilliSatoshis(126));
+        when(rebalanceService.getTargetCostsForPeer(PUBKEY)).thenReturn(Coins.ofMilliSatoshis(126));
        mockMvc.perform(get(NODE_PREFIX + "/rebalance-target-costs/"))
                .andExpect(content().string("126"));
    }

    @Test
    void getRebalanceTargetAmountForPeer() throws Exception {
-        when(rebalanceService.getRebalanceAmountToPeer(PUBKEY)).thenReturn(Coins.ofMilliSatoshis(999));
+        when(rebalanceService.getAmountToPeer(PUBKEY)).thenReturn(Coins.ofMilliSatoshis(999));
        mockMvc.perform(get(NODE_PREFIX + "/rebalance-target-amount/"))
                .andExpect(content().string("999"));
    }