diff --git a/backend/src/main/java/de/cotto/lndmanagej/service/ChannelDetailsService.java b/backend/src/main/java/de/cotto/lndmanagej/service/ChannelDetailsService.java index 328a31c5..a77b5f0a 100644 --- a/backend/src/main/java/de/cotto/lndmanagej/service/ChannelDetailsService.java +++ b/backend/src/main/java/de/cotto/lndmanagej/service/ChannelDetailsService.java @@ -8,7 +8,7 @@ import de.cotto.lndmanagej.model.FlowReport; import de.cotto.lndmanagej.model.LocalChannel; import de.cotto.lndmanagej.model.OnChainCosts; import de.cotto.lndmanagej.model.OpenCloseStatus; -import de.cotto.lndmanagej.model.Policies; +import de.cotto.lndmanagej.model.PoliciesForLocalChannel; import de.cotto.lndmanagej.model.Pubkey; import de.cotto.lndmanagej.model.RebalanceReport; import de.cotto.lndmanagej.model.warnings.ChannelWarnings; @@ -54,7 +54,7 @@ public class ChannelDetailsService { CompletableFuture remoteAlias = getAlias(remotePubkey); CompletableFuture balanceInformation = getBalanceInformation(channelId); CompletableFuture onChainCosts = getOnChainCosts(channelId); - CompletableFuture policies = getPoliciesForChannel(localChannel); + CompletableFuture policies = getPoliciesForChannel(localChannel); CompletableFuture feeReport = getFeeReport(channelId); CompletableFuture flowReport = getFlowReport(channelId); CompletableFuture rebalanceReport = getRebalanceReport(localChannel); @@ -106,10 +106,10 @@ public class ChannelDetailsService { ); } - private CompletableFuture getPoliciesForChannel(LocalChannel channel) { + private CompletableFuture getPoliciesForChannel(LocalChannel channel) { if (channel.getStatus().openCloseStatus() != OpenCloseStatus.OPEN) { - return CompletableFuture.completedFuture(Policies.UNKNOWN); + return CompletableFuture.completedFuture(PoliciesForLocalChannel.UNKNOWN); } - return CompletableFuture.supplyAsync(() -> policyService.getPolicies(channel.getId())); + return CompletableFuture.supplyAsync(() -> policyService.getPolicies(channel)); } } diff --git a/backend/src/main/java/de/cotto/lndmanagej/service/PolicyService.java b/backend/src/main/java/de/cotto/lndmanagej/service/PolicyService.java index ca7e45b2..9e932866 100644 --- a/backend/src/main/java/de/cotto/lndmanagej/service/PolicyService.java +++ b/backend/src/main/java/de/cotto/lndmanagej/service/PolicyService.java @@ -4,7 +4,8 @@ import com.codahale.metrics.annotation.Timed; import de.cotto.lndmanagej.grpc.GrpcFees; import de.cotto.lndmanagej.model.ChannelId; import de.cotto.lndmanagej.model.Coins; -import de.cotto.lndmanagej.model.Policies; +import de.cotto.lndmanagej.model.LocalChannel; +import de.cotto.lndmanagej.model.PoliciesForLocalChannel; import de.cotto.lndmanagej.model.Policy; import org.springframework.stereotype.Component; @@ -17,8 +18,9 @@ public class PolicyService { } @Timed - public Policies getPolicies(ChannelId channelId) { - return new Policies( + public PoliciesForLocalChannel getPolicies(LocalChannel localChannel) { + ChannelId channelId = localChannel.getId(); + return new PoliciesForLocalChannel( new Policy(getOutgoingFeeRate(channelId), getOutgoingBaseFee(channelId), isEnabledLocal(channelId)), new Policy(getIncomingFeeRate(channelId), getIncomingBaseFee(channelId), isEnabledRemote(channelId)) ); diff --git a/backend/src/test/java/de/cotto/lndmanagej/service/ChannelDetailsServiceTest.java b/backend/src/test/java/de/cotto/lndmanagej/service/ChannelDetailsServiceTest.java index cd697628..9bccad7a 100644 --- a/backend/src/test/java/de/cotto/lndmanagej/service/ChannelDetailsServiceTest.java +++ b/backend/src/test/java/de/cotto/lndmanagej/service/ChannelDetailsServiceTest.java @@ -3,7 +3,7 @@ package de.cotto.lndmanagej.service; import de.cotto.lndmanagej.model.BalanceInformation; import de.cotto.lndmanagej.model.ChannelDetails; import de.cotto.lndmanagej.model.LocalChannel; -import de.cotto.lndmanagej.model.Policies; +import de.cotto.lndmanagej.model.PoliciesForLocalChannel; import de.cotto.lndmanagej.model.RebalanceReport; import de.cotto.lndmanagej.model.warnings.ChannelWarnings; import org.junit.jupiter.api.BeforeEach; @@ -20,11 +20,12 @@ import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; import static de.cotto.lndmanagej.model.CoopClosedChannelFixtures.CLOSED_CHANNEL; import static de.cotto.lndmanagej.model.FeeReportFixtures.FEE_REPORT; import static de.cotto.lndmanagej.model.FlowReportFixtures.FLOW_REPORT; +import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL; import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_PRIVATE; import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS; import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS_2; import static de.cotto.lndmanagej.model.OnChainCostsFixtures.ON_CHAIN_COSTS; -import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES; +import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES_FOR_LOCAL_CHANNEL; 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; @@ -68,7 +69,7 @@ class ChannelDetailsServiceTest { lenient().when(rebalanceService.getReportForChannel(CHANNEL_ID)).thenReturn(RebalanceReport.EMPTY); lenient().when(feeService.getFeeReportForChannel(CHANNEL_ID)).thenReturn(FEE_REPORT); lenient().when(flowService.getFlowReportForChannel(CHANNEL_ID)).thenReturn(FLOW_REPORT); - lenient().when(policyService.getPolicies(CHANNEL_ID)).thenReturn(POLICIES); + lenient().when(policyService.getPolicies(LOCAL_OPEN_CHANNEL)).thenReturn(POLICIES_FOR_LOCAL_CHANNEL); lenient().when(channelWarningsService.getChannelWarnings(CHANNEL_ID)).thenReturn(ChannelWarnings.NONE); } @@ -79,6 +80,7 @@ class ChannelDetailsServiceTest { .thenReturn(Optional.ofNullable(LOCAL_OPEN_CHANNEL_PRIVATE.getBalanceInformation())); when(rebalanceService.getReportForChannel(CHANNEL_ID)).thenReturn(REBALANCE_REPORT); when(channelWarningsService.getChannelWarnings(CHANNEL_ID)).thenReturn(CHANNEL_WARNINGS); + when(policyService.getPolicies(LOCAL_OPEN_CHANNEL_PRIVATE)).thenReturn(POLICIES_FOR_LOCAL_CHANNEL); assertThat(channelDetailsService.getDetails(LOCAL_OPEN_CHANNEL_PRIVATE)).isEqualTo(CHANNEL_DETAILS); } @@ -89,7 +91,7 @@ class ChannelDetailsServiceTest { ALIAS_2, LOCAL_OPEN_CHANNEL_PRIVATE.getBalanceInformation(), ON_CHAIN_COSTS, - POLICIES, + POLICIES_FOR_LOCAL_CHANNEL, FEE_REPORT, FLOW_REPORT, RebalanceReport.EMPTY, @@ -98,6 +100,7 @@ class ChannelDetailsServiceTest { when(nodeService.getAlias(PUBKEY_2)).thenReturn(ALIAS_2); when(balanceService.getBalanceInformation(CHANNEL_ID)) .thenReturn(Optional.ofNullable(LOCAL_OPEN_CHANNEL_PRIVATE.getBalanceInformation())); + when(policyService.getPolicies(LOCAL_OPEN_CHANNEL_PRIVATE)).thenReturn(POLICIES_FOR_LOCAL_CHANNEL); assertThat(channelDetailsService.getDetails(LOCAL_OPEN_CHANNEL_PRIVATE)).isEqualTo(expectedDetails); } @@ -122,11 +125,11 @@ class ChannelDetailsServiceTest { ALIAS_2, BalanceInformation.EMPTY, ON_CHAIN_COSTS, - Policies.UNKNOWN, + PoliciesForLocalChannel.UNKNOWN, FEE_REPORT, FLOW_REPORT, RebalanceReport.EMPTY, ChannelWarnings.NONE ); } -} \ No newline at end of file +} diff --git a/backend/src/test/java/de/cotto/lndmanagej/service/PolicyServiceTest.java b/backend/src/test/java/de/cotto/lndmanagej/service/PolicyServiceTest.java index bfc7f089..2668b660 100644 --- a/backend/src/test/java/de/cotto/lndmanagej/service/PolicyServiceTest.java +++ b/backend/src/test/java/de/cotto/lndmanagej/service/PolicyServiceTest.java @@ -2,7 +2,7 @@ package de.cotto.lndmanagej.service; import de.cotto.lndmanagej.grpc.GrpcFees; import de.cotto.lndmanagej.model.Coins; -import de.cotto.lndmanagej.model.Policies; +import de.cotto.lndmanagej.model.PoliciesForLocalChannel; import de.cotto.lndmanagej.model.Policy; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -13,6 +13,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import java.util.Optional; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; +import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.mockito.Mockito.when; @@ -27,7 +28,7 @@ class PolicyServiceTest { @Test void getPolicies() { - Policies expected = new Policies( + PoliciesForLocalChannel expected = new PoliciesForLocalChannel( new Policy(789, Coins.ofMilliSatoshis(111), true), new Policy(123, Coins.ofMilliSatoshis(456), false) ); @@ -36,12 +37,12 @@ class PolicyServiceTest { when(grpcFees.isEnabledLocal(CHANNEL_ID)).thenReturn(Optional.of(true)); when(grpcFees.isEnabledRemote(CHANNEL_ID)).thenReturn(Optional.of(false)); - assertThat(policyService.getPolicies(CHANNEL_ID)).isEqualTo(expected); + assertThat(policyService.getPolicies(LOCAL_OPEN_CHANNEL)).isEqualTo(expected); } @Test void getPolicies_enabled_disabled_swapped() { - Policies expected = new Policies( + PoliciesForLocalChannel expected = new PoliciesForLocalChannel( new Policy(789, Coins.ofMilliSatoshis(111), false), new Policy(123, Coins.ofMilliSatoshis(456), true) ); @@ -50,12 +51,12 @@ class PolicyServiceTest { when(grpcFees.isEnabledLocal(CHANNEL_ID)).thenReturn(Optional.of(false)); when(grpcFees.isEnabledRemote(CHANNEL_ID)).thenReturn(Optional.of(true)); - assertThat(policyService.getPolicies(CHANNEL_ID)).isEqualTo(expected); + assertThat(policyService.getPolicies(LOCAL_OPEN_CHANNEL)).isEqualTo(expected); } @Test void getPolicies_not_found() { - assertThatIllegalStateException().isThrownBy(() -> policyService.getPolicies(CHANNEL_ID)); + assertThatIllegalStateException().isThrownBy(() -> policyService.getPolicies(LOCAL_OPEN_CHANNEL)); } private void mockFees() { @@ -64,4 +65,4 @@ class PolicyServiceTest { when(grpcFees.getIncomingFeeRate(CHANNEL_ID)).thenReturn(Optional.of(123L)); when(grpcFees.getIncomingBaseFee(CHANNEL_ID)).thenReturn(Optional.of(Coins.ofMilliSatoshis(456))); } -} \ No newline at end of file +} diff --git a/model/src/main/java/de/cotto/lndmanagej/model/ChannelDetails.java b/model/src/main/java/de/cotto/lndmanagej/model/ChannelDetails.java index ab5b936a..d949f284 100644 --- a/model/src/main/java/de/cotto/lndmanagej/model/ChannelDetails.java +++ b/model/src/main/java/de/cotto/lndmanagej/model/ChannelDetails.java @@ -7,7 +7,7 @@ public record ChannelDetails( String remoteAlias, BalanceInformation balanceInformation, OnChainCosts onChainCosts, - Policies policies, + PoliciesForLocalChannel policies, FeeReport feeReport, FlowReport flowReport, RebalanceReport rebalanceReport, diff --git a/model/src/main/java/de/cotto/lndmanagej/model/Policies.java b/model/src/main/java/de/cotto/lndmanagej/model/Policies.java deleted file mode 100644 index 7a10a432..00000000 --- a/model/src/main/java/de/cotto/lndmanagej/model/Policies.java +++ /dev/null @@ -1,8 +0,0 @@ -package de.cotto.lndmanagej.model; - -public record Policies( - Policy local, - Policy remote -) { - public static final Policies UNKNOWN = new Policies(Policy.UNKNOWN, Policy.UNKNOWN); -} diff --git a/model/src/main/java/de/cotto/lndmanagej/model/PoliciesForLocalChannel.java b/model/src/main/java/de/cotto/lndmanagej/model/PoliciesForLocalChannel.java new file mode 100644 index 00000000..106ee307 --- /dev/null +++ b/model/src/main/java/de/cotto/lndmanagej/model/PoliciesForLocalChannel.java @@ -0,0 +1,8 @@ +package de.cotto.lndmanagej.model; + +public record PoliciesForLocalChannel( + Policy local, + Policy remote +) { + public static final PoliciesForLocalChannel UNKNOWN = new PoliciesForLocalChannel(Policy.UNKNOWN, Policy.UNKNOWN); +} diff --git a/model/src/test/java/de/cotto/lndmanagej/model/ChannelDetailsTest.java b/model/src/test/java/de/cotto/lndmanagej/model/ChannelDetailsTest.java index b2819754..bf2a921b 100644 --- a/model/src/test/java/de/cotto/lndmanagej/model/ChannelDetailsTest.java +++ b/model/src/test/java/de/cotto/lndmanagej/model/ChannelDetailsTest.java @@ -9,7 +9,7 @@ import static de.cotto.lndmanagej.model.FlowReportFixtures.FLOW_REPORT; import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_PRIVATE; import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS; import static de.cotto.lndmanagej.model.OnChainCostsFixtures.ON_CHAIN_COSTS; -import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES; +import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES_FOR_LOCAL_CHANNEL; import static de.cotto.lndmanagej.model.RebalanceReportFixtures.REBALANCE_REPORT; import static de.cotto.lndmanagej.model.warnings.ChannelWarningsFixtures.CHANNEL_WARNINGS; import static org.assertj.core.api.Assertions.assertThat; @@ -37,7 +37,7 @@ class ChannelDetailsTest { @Test void policies() { - assertThat(CHANNEL_DETAILS.policies()).isEqualTo(POLICIES); + assertThat(CHANNEL_DETAILS.policies()).isEqualTo(POLICIES_FOR_LOCAL_CHANNEL); } @Test @@ -59,4 +59,4 @@ class ChannelDetailsTest { void warnings() { assertThat(CHANNEL_DETAILS.warnings()).isEqualTo(CHANNEL_WARNINGS); } -} \ No newline at end of file +} diff --git a/model/src/test/java/de/cotto/lndmanagej/model/PoliciesForLocalChannelTest.java b/model/src/test/java/de/cotto/lndmanagej/model/PoliciesForLocalChannelTest.java new file mode 100644 index 00000000..aab1a4ca --- /dev/null +++ b/model/src/test/java/de/cotto/lndmanagej/model/PoliciesForLocalChannelTest.java @@ -0,0 +1,26 @@ +package de.cotto.lndmanagej.model; + +import org.junit.jupiter.api.Test; + +import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES_FOR_LOCAL_CHANNEL; +import static de.cotto.lndmanagej.model.PolicyFixtures.POLICY_1; +import static de.cotto.lndmanagej.model.PolicyFixtures.POLICY_2; +import static org.assertj.core.api.Assertions.assertThat; + +class PoliciesForLocalChannelTest { + @Test + void local() { + assertThat(POLICIES_FOR_LOCAL_CHANNEL.local()).isEqualTo(POLICY_1); + } + + @Test + void remote() { + assertThat(POLICIES_FOR_LOCAL_CHANNEL.remote()).isEqualTo(POLICY_2); + } + + @Test + void unknown() { + assertThat(PoliciesForLocalChannel.UNKNOWN) + .isEqualTo(new PoliciesForLocalChannel(Policy.UNKNOWN, Policy.UNKNOWN)); + } +} diff --git a/model/src/test/java/de/cotto/lndmanagej/model/PoliciesTest.java b/model/src/test/java/de/cotto/lndmanagej/model/PoliciesTest.java deleted file mode 100644 index 0e082c95..00000000 --- a/model/src/test/java/de/cotto/lndmanagej/model/PoliciesTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.cotto.lndmanagej.model; - -import org.junit.jupiter.api.Test; - -import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES; -import static de.cotto.lndmanagej.model.PolicyFixtures.POLICY_1; -import static de.cotto.lndmanagej.model.PolicyFixtures.POLICY_2; -import static org.assertj.core.api.Assertions.assertThat; - -class PoliciesTest { - @Test - void local() { - assertThat(POLICIES.local()).isEqualTo(POLICY_1); - } - - @Test - void remote() { - assertThat(POLICIES.remote()).isEqualTo(POLICY_2); - } - - @Test - void unknown() { - assertThat(Policies.UNKNOWN).isEqualTo(new Policies(Policy.UNKNOWN, Policy.UNKNOWN)); - } -} diff --git a/model/src/test/java/de/cotto/lndmanagej/model/PolicyTest.java b/model/src/test/java/de/cotto/lndmanagej/model/PolicyTest.java index f4901852..4f701c18 100644 --- a/model/src/test/java/de/cotto/lndmanagej/model/PolicyTest.java +++ b/model/src/test/java/de/cotto/lndmanagej/model/PolicyTest.java @@ -25,4 +25,4 @@ class PolicyTest { void unknown() { assertThat(Policy.UNKNOWN).isEqualTo(new Policy(0, Coins.NONE, false)); } -} \ No newline at end of file +} diff --git a/model/src/testFixtures/java/de/cotto/lndmanagej/model/ChannelDetailsFixtures.java b/model/src/testFixtures/java/de/cotto/lndmanagej/model/ChannelDetailsFixtures.java index c16d709e..cd64fbd2 100644 --- a/model/src/testFixtures/java/de/cotto/lndmanagej/model/ChannelDetailsFixtures.java +++ b/model/src/testFixtures/java/de/cotto/lndmanagej/model/ChannelDetailsFixtures.java @@ -10,7 +10,7 @@ import static de.cotto.lndmanagej.model.FlowReportFixtures.FLOW_REPORT_2; import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_PRIVATE; import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS; import static de.cotto.lndmanagej.model.OnChainCostsFixtures.ON_CHAIN_COSTS; -import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES; +import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES_FOR_LOCAL_CHANNEL; import static de.cotto.lndmanagej.model.RebalanceReportFixtures.REBALANCE_REPORT; import static de.cotto.lndmanagej.model.RebalanceReportFixtures.REBALANCE_REPORT_2; import static de.cotto.lndmanagej.model.warnings.ChannelWarningsFixtures.CHANNEL_WARNINGS; @@ -21,7 +21,7 @@ public class ChannelDetailsFixtures { ALIAS, BALANCE_INFORMATION, ON_CHAIN_COSTS, - POLICIES, + POLICIES_FOR_LOCAL_CHANNEL, FEE_REPORT, FLOW_REPORT, REBALANCE_REPORT, @@ -33,7 +33,7 @@ public class ChannelDetailsFixtures { ALIAS, BALANCE_INFORMATION, ON_CHAIN_COSTS, - POLICIES, + POLICIES_FOR_LOCAL_CHANNEL, FEE_REPORT, FLOW_REPORT_2, REBALANCE_REPORT_2, @@ -45,7 +45,7 @@ public class ChannelDetailsFixtures { ALIAS, BalanceInformation.EMPTY, ON_CHAIN_COSTS, - Policies.UNKNOWN, + PoliciesForLocalChannel.UNKNOWN, FEE_REPORT, FLOW_REPORT, REBALANCE_REPORT, diff --git a/model/src/testFixtures/java/de/cotto/lndmanagej/model/PolicyFixtures.java b/model/src/testFixtures/java/de/cotto/lndmanagej/model/PolicyFixtures.java index 5a6caa1b..953afd0e 100644 --- a/model/src/testFixtures/java/de/cotto/lndmanagej/model/PolicyFixtures.java +++ b/model/src/testFixtures/java/de/cotto/lndmanagej/model/PolicyFixtures.java @@ -4,5 +4,6 @@ public class PolicyFixtures { public static final Policy POLICY_1 = new Policy(100, Coins.ofMilliSatoshis(10), false); public static final Policy POLICY_2 = new Policy(222, Coins.ofMilliSatoshis(0), true); - public static final Policies POLICIES = new Policies(POLICY_1, POLICY_2); + public static final PoliciesForLocalChannel POLICIES_FOR_LOCAL_CHANNEL = + new PoliciesForLocalChannel(POLICY_1, POLICY_2); } diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelControllerIT.java index 90caaa27..e6fee642 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelControllerIT.java @@ -37,7 +37,7 @@ 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.PolicyFixtures.POLICIES; +import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES_FOR_LOCAL_CHANNEL; import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_2; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.core.Is.is; @@ -227,7 +227,7 @@ class ChannelControllerIT { @Test void getPolicies() throws Exception { when(channelService.getLocalChannel(CHANNEL_ID)).thenReturn(Optional.of(LOCAL_OPEN_CHANNEL)); - when(policyService.getPolicies(CHANNEL_ID)).thenReturn(POLICIES); + when(policyService.getPolicies(LOCAL_OPEN_CHANNEL)).thenReturn(POLICIES_FOR_LOCAL_CHANNEL); mockMvc.perform(get(CHANNEL_PREFIX + "/policies")) .andExpect(jsonPath("$.local.feeRatePpm", is(100))) .andExpect(jsonPath("$.local.baseFeeMilliSat", is(10))) @@ -274,4 +274,4 @@ class ChannelControllerIT { .andExpect(jsonPath("$.earnedMilliSat", is("1234"))) .andExpect(jsonPath("$.sourcedMilliSat", is("567"))); } -} \ No newline at end of file +} diff --git a/web/src/main/java/de/cotto/lndmanagej/controller/ChannelController.java b/web/src/main/java/de/cotto/lndmanagej/controller/ChannelController.java index 2f791524..3e0c80ca 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/ChannelController.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/ChannelController.java @@ -13,7 +13,7 @@ import de.cotto.lndmanagej.model.ChannelId; import de.cotto.lndmanagej.model.ClosedChannel; import de.cotto.lndmanagej.model.LocalChannel; import de.cotto.lndmanagej.model.OpenCloseStatus; -import de.cotto.lndmanagej.model.Policies; +import de.cotto.lndmanagej.model.PoliciesForLocalChannel; import de.cotto.lndmanagej.service.BalanceService; import de.cotto.lndmanagej.service.ChannelDetailsService; import de.cotto.lndmanagej.service.ChannelService; @@ -83,9 +83,9 @@ public class ChannelController { public PoliciesDto getPolicies(@PathVariable ChannelId channelId) { LocalChannel localChannel = channelService.getLocalChannel(channelId).orElse(null); if (localChannel == null || localChannel.getStatus().openCloseStatus() != OpenCloseStatus.OPEN) { - return PoliciesDto.createFromModel(Policies.UNKNOWN); + return PoliciesDto.createFromModel(PoliciesForLocalChannel.UNKNOWN); } - return PoliciesDto.createFromModel(policyService.getPolicies(localChannel.getId())); + return PoliciesDto.createFromModel(policyService.getPolicies(localChannel)); } @Timed diff --git a/web/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDto.java b/web/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDto.java index 2471a2a9..07bce11e 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDto.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDto.java @@ -8,7 +8,7 @@ import de.cotto.lndmanagej.model.FlowReport; import de.cotto.lndmanagej.model.LocalChannel; import de.cotto.lndmanagej.model.OnChainCosts; import de.cotto.lndmanagej.model.OpenInitiator; -import de.cotto.lndmanagej.model.Policies; +import de.cotto.lndmanagej.model.PoliciesForLocalChannel; import de.cotto.lndmanagej.model.Pubkey; import de.cotto.lndmanagej.model.RebalanceReport; import de.cotto.lndmanagej.model.warnings.ChannelWarnings; @@ -43,7 +43,7 @@ public record ChannelDetailsDto( String remoteAlias, BalanceInformation balanceInformation, OnChainCosts onChainCosts, - Policies policies, + PoliciesForLocalChannel policiesForLocalChannel, FeeReport feeReport, FlowReport flowReport, RebalanceReport rebalanceReport, @@ -64,7 +64,7 @@ public record ChannelDetailsDto( channelDto.status(), BalanceInformationDto.createFromModel(balanceInformation), OnChainCostsDto.createFromModel(onChainCosts), - PoliciesDto.createFromModel(policies), + PoliciesDto.createFromModel(policiesForLocalChannel), channelDto.closeDetails(), FeeReportDto.createFromModel(feeReport), FlowReportDto.createFromModel(flowReport), @@ -79,7 +79,7 @@ public record ChannelDetailsDto( String remoteAlias, BalanceInformation balanceInformation, OnChainCosts onChainCosts, - Policies policies, + PoliciesForLocalChannel policiesForLocalChannel, FeeReport feeReport, FlowReport flowReport, RebalanceReport rebalanceReport, @@ -90,7 +90,7 @@ public record ChannelDetailsDto( remoteAlias, balanceInformation, onChainCosts, - policies, + policiesForLocalChannel, feeReport, flowReport, rebalanceReport, diff --git a/web/src/main/java/de/cotto/lndmanagej/controller/dto/PoliciesDto.java b/web/src/main/java/de/cotto/lndmanagej/controller/dto/PoliciesDto.java index bf156eb9..226864ac 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/dto/PoliciesDto.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/dto/PoliciesDto.java @@ -1,15 +1,15 @@ package de.cotto.lndmanagej.controller.dto; -import de.cotto.lndmanagej.model.Policies; +import de.cotto.lndmanagej.model.PoliciesForLocalChannel; public record PoliciesDto( PolicyDto local, PolicyDto remote ) { - public static PoliciesDto createFromModel(Policies policies) { + public static PoliciesDto createFromModel(PoliciesForLocalChannel policiesForLocalChannel) { return new PoliciesDto( - PolicyDto.createFromModel(policies.local()), - PolicyDto.createFromModel(policies.remote()) + PolicyDto.createFromModel(policiesForLocalChannel.local()), + PolicyDto.createFromModel(policiesForLocalChannel.remote()) ); } } diff --git a/web/src/test/java/de/cotto/lndmanagej/controller/ChannelControllerTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/ChannelControllerTest.java index c22494d5..83fd56b9 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/ChannelControllerTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/ChannelControllerTest.java @@ -9,7 +9,7 @@ import de.cotto.lndmanagej.controller.dto.PoliciesDto; import de.cotto.lndmanagej.model.BalanceInformation; import de.cotto.lndmanagej.model.Coins; import de.cotto.lndmanagej.model.FeeReport; -import de.cotto.lndmanagej.model.Policies; +import de.cotto.lndmanagej.model.PoliciesForLocalChannel; import de.cotto.lndmanagej.service.BalanceService; import de.cotto.lndmanagej.service.ChannelDetailsService; import de.cotto.lndmanagej.service.ChannelService; @@ -28,7 +28,7 @@ import static de.cotto.lndmanagej.model.ChannelDetailsFixtures.CHANNEL_DETAILS; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; import static de.cotto.lndmanagej.model.CoopClosedChannelFixtures.CLOSED_CHANNEL; import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL; -import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES; +import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES_FOR_LOCAL_CHANNEL; import static de.cotto.lndmanagej.model.WaitingCloseChannelFixtures.WAITING_CLOSE_CHANNEL; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -36,7 +36,7 @@ import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class ChannelControllerTest { - private static final PoliciesDto POLICIES_DTO = PoliciesDto.createFromModel(POLICIES); + private static final PoliciesDto POLICIES_DTO = PoliciesDto.createFromModel(POLICIES_FOR_LOCAL_CHANNEL); private static final ClosedChannelDetailsDto CLOSED_CHANNEL_DETAILS_DTO = ClosedChannelDetailsDto.createFromModel(CLOSED_CHANNEL); private static final FeeReport FEE_REPORT = new FeeReport(Coins.ofMilliSatoshis(1_234), Coins.ofMilliSatoshis(567)); @@ -111,19 +111,21 @@ class ChannelControllerTest { @Test void getPolicies() { when(channelService.getLocalChannel(CHANNEL_ID)).thenReturn(Optional.of(LOCAL_OPEN_CHANNEL)); - when(policyService.getPolicies(CHANNEL_ID)).thenReturn(POLICIES); + when(policyService.getPolicies(LOCAL_OPEN_CHANNEL)).thenReturn(POLICIES_FOR_LOCAL_CHANNEL); assertThat(channelController.getPolicies(CHANNEL_ID)).isEqualTo(POLICIES_DTO); } @Test void getPolicies_waiting_close() { when(channelService.getLocalChannel(CHANNEL_ID)).thenReturn(Optional.of(WAITING_CLOSE_CHANNEL)); - assertThat(channelController.getPolicies(CHANNEL_ID)).isEqualTo(PoliciesDto.createFromModel(Policies.UNKNOWN)); + assertThat(channelController.getPolicies(CHANNEL_ID)) + .isEqualTo(PoliciesDto.createFromModel(PoliciesForLocalChannel.UNKNOWN)); } @Test void getPolicies_channel_not_found() { - assertThat(channelController.getPolicies(CHANNEL_ID)).isEqualTo(PoliciesDto.createFromModel(Policies.UNKNOWN)); + assertThat(channelController.getPolicies(CHANNEL_ID)) + .isEqualTo(PoliciesDto.createFromModel(PoliciesForLocalChannel.UNKNOWN)); } @Test @@ -143,4 +145,4 @@ class ChannelControllerTest { when(feeService.getFeeReportForChannel(CHANNEL_ID)).thenReturn(FEE_REPORT); assertThat(channelController.getFeeReport(CHANNEL_ID)).isEqualTo(FeeReportDto.createFromModel(FEE_REPORT)); } -} \ No newline at end of file +} diff --git a/web/src/test/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDtoTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDtoTest.java index 0013ee9c..594bba17 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDtoTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDtoTest.java @@ -4,7 +4,7 @@ import de.cotto.lndmanagej.model.ChannelStatus; import de.cotto.lndmanagej.model.Coins; import de.cotto.lndmanagej.model.FeeReport; import de.cotto.lndmanagej.model.OpenInitiator; -import de.cotto.lndmanagej.model.Policies; +import de.cotto.lndmanagej.model.PoliciesForLocalChannel; import de.cotto.lndmanagej.model.RebalanceReport; import de.cotto.lndmanagej.model.warnings.ChannelWarnings; import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHAN import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS; import static de.cotto.lndmanagej.model.OnChainCostsFixtures.ON_CHAIN_COSTS; import static de.cotto.lndmanagej.model.OpenCloseStatus.OPEN; -import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES; +import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES_FOR_LOCAL_CHANNEL; import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_2; import static de.cotto.lndmanagej.model.RebalanceReportFixtures.REBALANCE_REPORT; import static de.cotto.lndmanagej.model.warnings.ChannelWarningsFixtures.CHANNEL_WARNINGS; @@ -38,7 +38,7 @@ class ChannelDetailsDtoTest { ALIAS, BALANCE_INFORMATION, ON_CHAIN_COSTS, - Policies.UNKNOWN, + PoliciesForLocalChannel.UNKNOWN, FEE_REPORT, FLOW_REPORT, REBALANCE_REPORT, @@ -52,7 +52,7 @@ class ChannelDetailsDtoTest { ALIAS, BALANCE_INFORMATION, ON_CHAIN_COSTS, - POLICIES, + POLICIES_FOR_LOCAL_CHANNEL, FEE_REPORT, FLOW_REPORT, REBALANCE_REPORT, @@ -113,7 +113,7 @@ class ChannelDetailsDtoTest { ALIAS, BALANCE_INFORMATION, ON_CHAIN_COSTS, - Policies.UNKNOWN, + PoliciesForLocalChannel.UNKNOWN, FEE_REPORT, FLOW_REPORT, RebalanceReport.EMPTY, @@ -155,4 +155,4 @@ class ChannelDetailsDtoTest { .isEqualTo(RebalanceReportDto.createFromModel(REBALANCE_REPORT)); } -} \ No newline at end of file +} diff --git a/web/src/test/java/de/cotto/lndmanagej/controller/dto/PoliciesDtoTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/dto/PoliciesForLocalChannelDtoTest.java similarity index 70% rename from web/src/test/java/de/cotto/lndmanagej/controller/dto/PoliciesDtoTest.java rename to web/src/test/java/de/cotto/lndmanagej/controller/dto/PoliciesForLocalChannelDtoTest.java index 20cc179f..62d6af41 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/dto/PoliciesDtoTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/dto/PoliciesForLocalChannelDtoTest.java @@ -2,17 +2,17 @@ package de.cotto.lndmanagej.controller.dto; import org.junit.jupiter.api.Test; -import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES; +import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES_FOR_LOCAL_CHANNEL; import static de.cotto.lndmanagej.model.PolicyFixtures.POLICY_1; import static de.cotto.lndmanagej.model.PolicyFixtures.POLICY_2; import static org.assertj.core.api.Assertions.assertThat; -class PoliciesDtoTest { +class PoliciesForLocalChannelDtoTest { @Test void createFromModel() { PoliciesDto expected = new PoliciesDto(PolicyDto.createFromModel(POLICY_1), PolicyDto.createFromModel(POLICY_2)); - PoliciesDto dto = PoliciesDto.createFromModel(POLICIES); + PoliciesDto dto = PoliciesDto.createFromModel(POLICIES_FOR_LOCAL_CHANNEL); assertThat(dto).isEqualTo(expected); } -} \ No newline at end of file +}