diff --git a/backend/src/main/java/de/cotto/lndmanagej/service/BalanceService.java b/backend/src/main/java/de/cotto/lndmanagej/service/BalanceService.java index 6145b456..88a3a39f 100644 --- a/backend/src/main/java/de/cotto/lndmanagej/service/BalanceService.java +++ b/backend/src/main/java/de/cotto/lndmanagej/service/BalanceService.java @@ -23,7 +23,7 @@ public class BalanceService { } @Timed - public Coins getAvailableLocalBalance(Pubkey peer) { + public Coins getAvailableLocalBalanceForPeer(Pubkey peer) { return channelService.getOpenChannelsWith(peer).stream() .map(LocalOpenChannel::getId) .map(this::getAvailableLocalBalance) @@ -38,7 +38,7 @@ public class BalanceService { } @Timed - public Coins getAvailableRemoteBalance(Pubkey peer) { + public Coins getAvailableRemoteBalanceForPeer(Pubkey peer) { return channelService.getOpenChannelsWith(peer).stream() .map(LocalOpenChannel::getId) .map(this::getAvailableRemoteBalance) @@ -53,7 +53,7 @@ public class BalanceService { } @Timed - public BalanceInformation getBalanceInformation(Pubkey pubkey) { + public BalanceInformation getBalanceInformationForPeer(Pubkey pubkey) { return channelService.getOpenChannelsWith(pubkey).parallelStream() .map(Channel::getId) .map(this::getBalanceInformation) diff --git a/backend/src/main/java/de/cotto/lndmanagej/service/ChannelService.java b/backend/src/main/java/de/cotto/lndmanagej/service/ChannelService.java index 5b57e1c4..de895a58 100644 --- a/backend/src/main/java/de/cotto/lndmanagej/service/ChannelService.java +++ b/backend/src/main/java/de/cotto/lndmanagej/service/ChannelService.java @@ -119,14 +119,14 @@ public class ChannelService { } @Timed - public Set getWaitingCloseChannelsFor(Pubkey peer) { + public Set getWaitingCloseChannelsWith(Pubkey peer) { return getWaitingCloseChannels().stream() .filter(c -> peer.equals(c.getRemotePubkey())) .collect(Collectors.toSet()); } @Timed - public Set getForceClosingChannelsFor(Pubkey peer) { + public Set getForceClosingChannelsWith(Pubkey peer) { return getForceClosingChannels().stream() .filter(c -> peer.equals(c.getRemotePubkey())) .collect(Collectors.toSet()); diff --git a/backend/src/main/java/de/cotto/lndmanagej/service/OnChainCostService.java b/backend/src/main/java/de/cotto/lndmanagej/service/OnChainCostService.java index 462a8f06..1d0fc38a 100644 --- a/backend/src/main/java/de/cotto/lndmanagej/service/OnChainCostService.java +++ b/backend/src/main/java/de/cotto/lndmanagej/service/OnChainCostService.java @@ -27,18 +27,18 @@ public class OnChainCostService { @Timed public Coins getOpenCostsWith(Pubkey pubkey) { return channelService.getAllChannelsWith(pubkey).parallelStream() - .map(this::getOpenCosts) + .map(this::getOpenCostsForChannel) .flatMap(Optional::stream) .reduce(Coins.NONE, Coins::add); } @Timed - public Optional getOpenCosts(ChannelId channelId) { - return channelService.getLocalChannel(channelId).flatMap(this::getOpenCosts); + public Optional getOpenCostsForChannelId(ChannelId channelId) { + return channelService.getLocalChannel(channelId).flatMap(this::getOpenCostsForChannel); } @Timed - public Optional getOpenCosts(LocalChannel localChannel) { + public Optional getOpenCostsForChannel(LocalChannel localChannel) { if (localChannel.getOpenInitiator().equals(OpenInitiator.LOCAL)) { String openTransactionHash = localChannel.getChannelPoint().getTransactionHash(); return transactionService.getTransaction(openTransactionHash) @@ -58,21 +58,21 @@ public class OnChainCostService { @Timed public Coins getCloseCostsWith(Pubkey pubkey) { return channelService.getClosedChannelsWith(pubkey).parallelStream() - .map(this::getCloseCosts) + .map(this::getCloseCostsForChannel) .flatMap(Optional::stream) .reduce(Coins.NONE, Coins::add); } @Timed - public Optional getCloseCosts(ChannelId channelId) { + public Optional getCloseCostsForChannelId(ChannelId channelId) { if (channelService.isClosed(channelId)) { - return channelService.getClosedChannel(channelId).flatMap(this::getCloseCosts); + return channelService.getClosedChannel(channelId).flatMap(this::getCloseCostsForChannel); } return Optional.of(Coins.NONE); } @Timed - public Optional getCloseCosts(ClosedChannel closedChannel) { + public Optional getCloseCostsForChannel(ClosedChannel closedChannel) { if (closedChannel.getOpenInitiator().equals(OpenInitiator.LOCAL)) { return transactionService.getTransaction(closedChannel.getCloseTransactionHash()) .map(Transaction::fees); diff --git a/backend/src/test/java/de/cotto/lndmanagej/service/BalanceServiceTest.java b/backend/src/test/java/de/cotto/lndmanagej/service/BalanceServiceTest.java index 97c35c73..466a6727 100644 --- a/backend/src/test/java/de/cotto/lndmanagej/service/BalanceServiceTest.java +++ b/backend/src/test/java/de/cotto/lndmanagej/service/BalanceServiceTest.java @@ -44,7 +44,7 @@ class BalanceServiceTest { when(channelService.getOpenChannelsWith(PUBKEY)).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_2)); when(grpcChannels.getChannel(CHANNEL_ID)).thenReturn(Optional.of(LOCAL_OPEN_CHANNEL_MORE_BALANCE)); when(grpcChannels.getChannel(CHANNEL_ID_2)).thenReturn(Optional.of(LOCAL_OPEN_CHANNEL_MORE_BALANCE_2)); - assertThat(balanceService.getBalanceInformation(PUBKEY)).isEqualTo(expected); + assertThat(balanceService.getBalanceInformationForPeer(PUBKEY)).isEqualTo(expected); } @Test @@ -85,23 +85,23 @@ class BalanceServiceTest { @Test void getAvailableLocalBalance_peer() { mockChannels(); - assertThat(balanceService.getAvailableLocalBalance(PUBKEY)).isEqualTo(Coins.ofSatoshis(1_800)); + assertThat(balanceService.getAvailableLocalBalanceForPeer(PUBKEY)).isEqualTo(Coins.ofSatoshis(1_800)); } @Test void getAvailableLocalBalance_peer_empty() { - assertThat(balanceService.getAvailableLocalBalance(PUBKEY)).isEqualTo(Coins.NONE); + assertThat(balanceService.getAvailableLocalBalanceForPeer(PUBKEY)).isEqualTo(Coins.NONE); } @Test void getAvailableRemoteBalance_peer() { mockChannels(); - assertThat(balanceService.getAvailableRemoteBalance(PUBKEY)).isEqualTo(Coins.ofSatoshis(226)); + assertThat(balanceService.getAvailableRemoteBalanceForPeer(PUBKEY)).isEqualTo(Coins.ofSatoshis(226)); } @Test void getAvailableRemoteBalance_peer_empty() { - assertThat(balanceService.getAvailableRemoteBalance(PUBKEY)).isEqualTo(Coins.NONE); + assertThat(balanceService.getAvailableRemoteBalanceForPeer(PUBKEY)).isEqualTo(Coins.NONE); } private void mockChannels() { diff --git a/backend/src/test/java/de/cotto/lndmanagej/service/ChannelServiceTest.java b/backend/src/test/java/de/cotto/lndmanagej/service/ChannelServiceTest.java index 548406fe..13b11e2f 100644 --- a/backend/src/test/java/de/cotto/lndmanagej/service/ChannelServiceTest.java +++ b/backend/src/test/java/de/cotto/lndmanagej/service/ChannelServiceTest.java @@ -129,7 +129,7 @@ class ChannelServiceTest { @Test void getWaitingCloseChannelsWith_by_pubkey() { when(grpcChannels.getWaitingCloseChannels()).thenReturn(Set.of(WAITING_CLOSE_CHANNEL, WAITING_CLOSE_CHANNEL_2)); - assertThat(channelService.getWaitingCloseChannelsFor(PUBKEY_2)) + assertThat(channelService.getWaitingCloseChannelsWith(PUBKEY_2)) .containsExactlyInAnyOrder(WAITING_CLOSE_CHANNEL, WAITING_CLOSE_CHANNEL_2); } @@ -138,14 +138,14 @@ class ChannelServiceTest { when(grpcChannels.getWaitingCloseChannels()).thenReturn( Set.of(WAITING_CLOSE_CHANNEL, WAITING_CLOSE_CHANNEL_2, WAITING_CLOSE_CHANNEL_TO_NODE_3) ); - assertThat(channelService.getWaitingCloseChannelsFor(PUBKEY_2)) + assertThat(channelService.getWaitingCloseChannelsWith(PUBKEY_2)) .containsExactlyInAnyOrder(WAITING_CLOSE_CHANNEL, WAITING_CLOSE_CHANNEL_2); } @Test void getForceClosingChannelsWith_by_pubkey() { when(grpcChannels.getForceClosingChannels()).thenReturn(Set.of(FORCE_CLOSING_CHANNEL, FORCE_CLOSING_CHANNEL_2)); - assertThat(channelService.getForceClosingChannelsFor(PUBKEY_2)) + assertThat(channelService.getForceClosingChannelsWith(PUBKEY_2)) .containsExactlyInAnyOrder(FORCE_CLOSING_CHANNEL, FORCE_CLOSING_CHANNEL_2); } @@ -154,7 +154,7 @@ class ChannelServiceTest { when(grpcChannels.getForceClosingChannels()).thenReturn( Set.of(FORCE_CLOSING_CHANNEL, FORCE_CLOSING_CHANNEL_2, FORCE_CLOSING_CHANNEL_TO_NODE_3) ); - assertThat(channelService.getForceClosingChannelsFor(PUBKEY_2)) + assertThat(channelService.getForceClosingChannelsWith(PUBKEY_2)) .containsExactlyInAnyOrder(FORCE_CLOSING_CHANNEL, FORCE_CLOSING_CHANNEL_2); } diff --git a/backend/src/test/java/de/cotto/lndmanagej/service/OnChainCostServiceTest.java b/backend/src/test/java/de/cotto/lndmanagej/service/OnChainCostServiceTest.java index 5115534e..f9ad22d6 100644 --- a/backend/src/test/java/de/cotto/lndmanagej/service/OnChainCostServiceTest.java +++ b/backend/src/test/java/de/cotto/lndmanagej/service/OnChainCostServiceTest.java @@ -76,93 +76,93 @@ class OnChainCostServiceTest { @Test void getOpenCosts_by_channel_id_not_resolved() { - assertThat(onChainCostService.getOpenCosts(CHANNEL_ID)).isEmpty(); + assertThat(onChainCostService.getOpenCostsForChannelId(CHANNEL_ID)).isEmpty(); } @Test void getOpenCosts_by_channel_id_resolved() { mockOpenTransaction(LOCAL_OPEN_CHANNEL); when(channelService.getLocalChannel(CHANNEL_ID)).thenReturn(Optional.of(LOCAL_OPEN_CHANNEL)); - assertThat(onChainCostService.getOpenCosts(CHANNEL_ID)).contains(OPEN_COSTS); + assertThat(onChainCostService.getOpenCostsForChannelId(CHANNEL_ID)).contains(OPEN_COSTS); } @Test void getOpenCosts_for_local_open_channel_initiator_local_transaction_not_found() { - assertThat(onChainCostService.getOpenCosts(LOCAL_OPEN_CHANNEL)).isEmpty(); + assertThat(onChainCostService.getOpenCostsForChannel(LOCAL_OPEN_CHANNEL)).isEmpty(); } @Test void getOpenCosts_for_local_open_channel_initiator_local() { mockOpenTransaction(LOCAL_OPEN_CHANNEL); - assertThat(onChainCostService.getOpenCosts(LOCAL_OPEN_CHANNEL)) + assertThat(onChainCostService.getOpenCostsForChannel(LOCAL_OPEN_CHANNEL)) .contains(OPEN_COSTS); } @Test void getOpenCosts_for_local_open_channel_initiator_remote() { mockOpenTransaction(LOCAL_OPEN_CHANNEL_2); - assertThat(onChainCostService.getOpenCosts(LOCAL_OPEN_CHANNEL_2)) + assertThat(onChainCostService.getOpenCostsForChannel(LOCAL_OPEN_CHANNEL_2)) .contains(Coins.NONE); } @Test void getOpenCosts_for_coop_closed_channel_initiator_local() { mockOpenTransaction(CLOSED_CHANNEL); - assertThat(onChainCostService.getOpenCosts(CLOSED_CHANNEL)) + assertThat(onChainCostService.getOpenCostsForChannel(CLOSED_CHANNEL)) .contains(OPEN_COSTS); } @Test void getOpenCosts_for_coop_closed_channel_initiator_unknown() { - assertThat(onChainCostService.getOpenCosts(CLOSED_CHANNEL_2)).isEmpty(); + assertThat(onChainCostService.getOpenCostsForChannel(CLOSED_CHANNEL_2)).isEmpty(); } @Test void getOpenCosts_for_coop_closed_channel_initiator_remote() { mockOpenTransaction(CLOSED_CHANNEL_3); - assertThat(onChainCostService.getOpenCosts(CLOSED_CHANNEL_3)) + assertThat(onChainCostService.getOpenCostsForChannel(CLOSED_CHANNEL_3)) .contains(Coins.NONE); } @Test void getOpenCosts_for_force_closed_channel_initiator_local() { mockOpenTransaction(FORCE_CLOSED_CHANNEL_OPEN_LOCAL); - assertThat(onChainCostService.getOpenCosts(FORCE_CLOSED_CHANNEL_OPEN_LOCAL)) + assertThat(onChainCostService.getOpenCostsForChannel(FORCE_CLOSED_CHANNEL_OPEN_LOCAL)) .contains(OPEN_COSTS); } @Test void getOpenCosts_for_force_closed_channel_initiator_remote() { mockOpenTransaction(FORCE_CLOSED_CHANNEL_OPEN_REMOTE); - assertThat(onChainCostService.getOpenCosts(FORCE_CLOSED_CHANNEL_OPEN_REMOTE)) + assertThat(onChainCostService.getOpenCostsForChannel(FORCE_CLOSED_CHANNEL_OPEN_REMOTE)) .contains(Coins.NONE); } @Test void getOpenCosts_for_waiting_close_channel_initiator_local() { mockOpenTransaction(WAITING_CLOSE_CHANNEL); - assertThat(onChainCostService.getOpenCosts(WAITING_CLOSE_CHANNEL)) + assertThat(onChainCostService.getOpenCostsForChannel(WAITING_CLOSE_CHANNEL)) .contains(OPEN_COSTS); } @Test void getOpenCosts_for_waiting_close_channel_initiator_remote() { mockOpenTransaction(WAITING_CLOSE_CHANNEL_2); - assertThat(onChainCostService.getOpenCosts(WAITING_CLOSE_CHANNEL_2)) + assertThat(onChainCostService.getOpenCostsForChannel(WAITING_CLOSE_CHANNEL_2)) .contains(Coins.NONE); } @Test void getOpenCosts_for_force_closing_channel_initiator_local() { mockOpenTransaction(FORCE_CLOSING_CHANNEL); - assertThat(onChainCostService.getOpenCosts(FORCE_CLOSING_CHANNEL)) + assertThat(onChainCostService.getOpenCostsForChannel(FORCE_CLOSING_CHANNEL)) .contains(OPEN_COSTS); } @Test void getOpenCosts_for_force_closing_channel_initiator_remote() { mockOpenTransaction(FORCE_CLOSING_CHANNEL_2); - assertThat(onChainCostService.getOpenCosts(FORCE_CLOSING_CHANNEL_2)) + assertThat(onChainCostService.getOpenCostsForChannel(FORCE_CLOSING_CHANNEL_2)) .contains(Coins.NONE); } @@ -171,7 +171,7 @@ class OnChainCostServiceTest { assertThat(OPEN_COSTS.satoshis()).isEqualTo(124); mockOpenTransaction(LOCAL_OPEN_CHANNEL); when(channelService.getAllLocalChannels()).thenReturn(Stream.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_2)); - assertThat(onChainCostService.getOpenCosts(LOCAL_OPEN_CHANNEL)) + assertThat(onChainCostService.getOpenCostsForChannel(LOCAL_OPEN_CHANNEL)) .contains(Coins.ofSatoshis(62)); } @@ -182,7 +182,7 @@ class OnChainCostServiceTest { when(channelService.getAllLocalChannels()).thenReturn( Stream.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_2, CLOSED_CHANNEL, CLOSED_CHANNEL_3) ); - assertThat(onChainCostService.getOpenCosts(LOCAL_OPEN_CHANNEL)) + assertThat(onChainCostService.getOpenCostsForChannel(LOCAL_OPEN_CHANNEL)) .contains(Coins.ofSatoshis(41)); } @@ -215,57 +215,57 @@ class OnChainCostServiceTest { @Test void getCloseCosts_by_channel_id_not_resolved() { - assertThat(onChainCostService.getCloseCosts(CHANNEL_ID)).isEmpty(); + assertThat(onChainCostService.getCloseCostsForChannelId(CHANNEL_ID)).isEmpty(); } @Test void getCloseCosts_by_channel_id_not_closed() { when(channelService.isClosed(CHANNEL_ID)).thenReturn(false); - assertThat(onChainCostService.getCloseCosts(CHANNEL_ID)).contains(Coins.NONE); + assertThat(onChainCostService.getCloseCostsForChannelId(CHANNEL_ID)).contains(Coins.NONE); } @Test void getCloseCosts_by_channel_id_resolved() { mockCloseTransaction(CLOSED_CHANNEL); when(channelService.getClosedChannel(CHANNEL_ID)).thenReturn(Optional.of(CLOSED_CHANNEL)); - assertThat(onChainCostService.getCloseCosts(CHANNEL_ID)).contains(CLOSE_COSTS); + assertThat(onChainCostService.getCloseCostsForChannelId(CHANNEL_ID)).contains(CLOSE_COSTS); } @Test void getOpenCosts_for_coop_closed_channel_initiator_local_transaction_not_found() { - assertThat(onChainCostService.getCloseCosts(CLOSED_CHANNEL)).isEmpty(); + assertThat(onChainCostService.getCloseCostsForChannel(CLOSED_CHANNEL)).isEmpty(); } @Test void getOpenCosts_for_coop_closed_channel_initiator_local() { mockCloseTransaction(CLOSED_CHANNEL); - assertThat(onChainCostService.getCloseCosts(CLOSED_CHANNEL)) + assertThat(onChainCostService.getCloseCostsForChannel(CLOSED_CHANNEL)) .contains(CLOSE_COSTS); } @Test void getOpenCosts_for_coop_closed_channel_initiator_unknown() { - assertThat(onChainCostService.getCloseCosts(CLOSED_CHANNEL_2)).isEmpty(); + assertThat(onChainCostService.getCloseCostsForChannel(CLOSED_CHANNEL_2)).isEmpty(); } @Test void getOpenCosts_for_coop_closed_channel_initiator_remote() { mockCloseTransaction(CLOSED_CHANNEL_3); - assertThat(onChainCostService.getCloseCosts(CLOSED_CHANNEL_3)) + assertThat(onChainCostService.getCloseCostsForChannel(CLOSED_CHANNEL_3)) .contains(Coins.NONE); } @Test void getOpenCosts_for_force_closed_channel_initiator_local() { mockCloseTransaction(FORCE_CLOSED_CHANNEL_OPEN_LOCAL); - assertThat(onChainCostService.getCloseCosts(FORCE_CLOSED_CHANNEL_OPEN_LOCAL)) + assertThat(onChainCostService.getCloseCostsForChannel(FORCE_CLOSED_CHANNEL_OPEN_LOCAL)) .contains(CLOSE_COSTS); } @Test void getOpenCosts_for_force_closed_channel_initiator_remote() { mockCloseTransaction(FORCE_CLOSED_CHANNEL_OPEN_REMOTE); - assertThat(onChainCostService.getCloseCosts(FORCE_CLOSED_CHANNEL_OPEN_REMOTE)) + assertThat(onChainCostService.getCloseCostsForChannel(FORCE_CLOSED_CHANNEL_OPEN_REMOTE)) .contains(Coins.NONE); } 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 8739feab..f77c7b64 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelControllerIT.java @@ -120,8 +120,8 @@ class ChannelControllerIT { 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.getOpenCosts(CHANNEL_ID)).thenReturn(Optional.of(Coins.ofSatoshis(1000))); - when(onChainCostService.getCloseCosts(CHANNEL_ID)).thenReturn(Optional.of(Coins.ofSatoshis(2000))); + when(onChainCostService.getOpenCostsForChannelId(CHANNEL_ID)).thenReturn(Optional.of(Coins.ofSatoshis(1000))); + when(onChainCostService.getCloseCostsForChannelId(CHANNEL_ID)).thenReturn(Optional.of(Coins.ofSatoshis(2000))); when(balanceService.getBalanceInformation(CHANNEL_ID)).thenReturn(Optional.of(BALANCE_INFORMATION_2)); when(feeService.getFeeReportForChannel(CHANNEL_ID)).thenReturn(FEE_REPORT); mockMvc.perform(get(DETAILS_PREFIX)) diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java index 465af26a..07cf90e4 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java @@ -76,11 +76,11 @@ class NodeControllerIT { when(nodeService.getNode(PUBKEY_2)).thenReturn(new Node(PUBKEY_2, ALIAS_2, 0, true)); when(channelService.getOpenChannelsWith(PUBKEY_2)).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_2)); when(channelService.getClosedChannelsWith(PUBKEY_2)).thenReturn(Set.of(CLOSED_CHANNEL, CLOSED_CHANNEL_3)); - when(channelService.getWaitingCloseChannelsFor(PUBKEY_2)).thenReturn(Set.of(WAITING_CLOSE_CHANNEL)); - when(channelService.getForceClosingChannelsFor(PUBKEY_2)).thenReturn(Set.of(FORCE_CLOSING_CHANNEL_2)); + 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.getOpenCostsWith(PUBKEY_2)).thenReturn(Coins.ofSatoshis(123)); when(onChainCostService.getCloseCostsWith(PUBKEY_2)).thenReturn(Coins.ofSatoshis(456)); - when(balanceService.getBalanceInformation(PUBKEY_2)).thenReturn(BALANCE_INFORMATION); + when(balanceService.getBalanceInformationForPeer(PUBKEY_2)).thenReturn(BALANCE_INFORMATION); when(feeService.getFeeReportForPeer(PUBKEY_2)).thenReturn(FEE_REPORT); List channelIds = List.of(CHANNEL_ID.toString(), CHANNEL_ID_2.toString()); List closedChannelIds = List.of(CHANNEL_ID.toString(), CHANNEL_ID_3.toString()); @@ -126,7 +126,7 @@ class NodeControllerIT { @Test void getBalance() throws Exception { - when(balanceService.getBalanceInformation(PUBKEY_2)).thenReturn(BALANCE_INFORMATION); + when(balanceService.getBalanceInformationForPeer(PUBKEY_2)).thenReturn(BALANCE_INFORMATION); mockMvc.perform(get(NODE_PREFIX + "/balance")) .andExpect(jsonPath("$.localBalance", is("1000"))) .andExpect(jsonPath("$.localReserve", is("100"))) diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/OnChainCostsControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/OnChainCostsControllerIT.java index b6e9f32f..d8d3cd93 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/OnChainCostsControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/OnChainCostsControllerIT.java @@ -46,7 +46,7 @@ class OnChainCostsControllerIT { @Test void open_costs_for_channel() throws Exception { - when(onChainCostService.getOpenCosts(CHANNEL_ID)).thenReturn(Optional.of(Coins.ofSatoshis(123))); + when(onChainCostService.getOpenCostsForChannelId(CHANNEL_ID)).thenReturn(Optional.of(Coins.ofSatoshis(123))); mockMvc.perform(get(CHANNEL_PREFIX + "/open-costs")) .andExpect(content().string("123")); } @@ -60,7 +60,7 @@ class OnChainCostsControllerIT { @Test void close_costs_for_channel() throws Exception { - when(onChainCostService.getCloseCosts(CHANNEL_ID)).thenReturn(Optional.of(Coins.ofSatoshis(123))); + when(onChainCostService.getCloseCostsForChannelId(CHANNEL_ID)).thenReturn(Optional.of(Coins.ofSatoshis(123))); mockMvc.perform(get(CHANNEL_PREFIX + "/close-costs")) .andExpect(content().string("123")); } 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 a93c62ca..3e483a79 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/ChannelController.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/ChannelController.java @@ -139,8 +139,8 @@ public class ChannelController { } private OnChainCostsDto getOnChainCosts(ChannelId channelId) { - Coins openCosts = onChainCostService.getOpenCosts(channelId).orElse(Coins.NONE); - Coins closeCosts = onChainCostService.getCloseCosts(channelId).orElse(Coins.NONE); + Coins openCosts = onChainCostService.getOpenCostsForChannelId(channelId).orElse(Coins.NONE); + Coins closeCosts = onChainCostService.getCloseCostsForChannelId(channelId).orElse(Coins.NONE); return new OnChainCostsDto(openCosts, closeCosts); } diff --git a/web/src/main/java/de/cotto/lndmanagej/controller/NodeController.java b/web/src/main/java/de/cotto/lndmanagej/controller/NodeController.java index 172f2add..98a16671 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/NodeController.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/NodeController.java @@ -64,14 +64,14 @@ public class NodeController { Node node = nodeService.getNode(pubkey); Coins openCosts = onChainCostService.getOpenCostsWith(pubkey); Coins closeCosts = onChainCostService.getCloseCostsWith(pubkey); - BalanceInformation balanceInformation = balanceService.getBalanceInformation(pubkey); + BalanceInformation balanceInformation = balanceService.getBalanceInformationForPeer(pubkey); return new NodeDetailsDto( pubkey, node.alias(), toSortedList(channelService.getOpenChannelsWith(pubkey)), toSortedList(channelService.getClosedChannelsWith(pubkey)), - toSortedList(channelService.getWaitingCloseChannelsFor(pubkey)), - toSortedList(channelService.getForceClosingChannelsFor(pubkey)), + toSortedList(channelService.getWaitingCloseChannelsWith(pubkey)), + toSortedList(channelService.getForceClosingChannelsWith(pubkey)), new OnChainCostsDto(openCosts, closeCosts), BalanceInformationDto.createFrom(balanceInformation), node.online(), @@ -96,7 +96,7 @@ public class NodeController { @Timed @GetMapping("/balance") public BalanceInformationDto getBalance(@PathVariable Pubkey pubkey) { - return BalanceInformationDto.createFrom(balanceService.getBalanceInformation(pubkey)); + return BalanceInformationDto.createFrom(balanceService.getBalanceInformationForPeer(pubkey)); } @Timed diff --git a/web/src/main/java/de/cotto/lndmanagej/controller/OnChainCostsController.java b/web/src/main/java/de/cotto/lndmanagej/controller/OnChainCostsController.java index c5a9fe51..09d18197 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/OnChainCostsController.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/OnChainCostsController.java @@ -32,14 +32,14 @@ public class OnChainCostsController { @Timed @GetMapping("/channel/{channelId}/open-costs") public long getOpenCostsForChannel(@PathVariable ChannelId channelId) throws CostException { - return onChainCostService.getOpenCosts(channelId).map(Coins::satoshis) + return onChainCostService.getOpenCostsForChannelId(channelId).map(Coins::satoshis) .orElseThrow(() -> new CostException("Unable to get open costs for channel with ID " + channelId)); } @Timed @GetMapping("/channel/{channelId}/close-costs") public long getCloseCostsForChannel(@PathVariable ChannelId channelId) throws CostException { - return onChainCostService.getCloseCosts(channelId).map(Coins::satoshis) + return onChainCostService.getCloseCostsForChannelId(channelId).map(Coins::satoshis) .orElseThrow(() -> new CostException("Unable to get close costs for channel with ID " + channelId)); } 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 1f5650cf..2eae5171 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/ChannelControllerTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/ChannelControllerTest.java @@ -75,8 +75,8 @@ class ChannelControllerTest { @BeforeEach void setUp() { - lenient().when(onChainCostService.getOpenCosts(CHANNEL_ID)).thenReturn(Optional.of(OPEN_COSTS)); - lenient().when(onChainCostService.getCloseCosts(CHANNEL_ID)).thenReturn(Optional.of(CLOSE_COSTS)); + lenient().when(onChainCostService.getOpenCostsForChannelId(CHANNEL_ID)).thenReturn(Optional.of(OPEN_COSTS)); + lenient().when(onChainCostService.getCloseCostsForChannelId(CHANNEL_ID)).thenReturn(Optional.of(CLOSE_COSTS)); lenient().when(policyService.getPolicies(CHANNEL_ID)).thenReturn(POLICIES); lenient().when(feeService.getFeeReportForChannel(CHANNEL_ID)).thenReturn(FEE_REPORT); } diff --git a/web/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java index cb3e3aa0..89ab23f0 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java @@ -78,7 +78,7 @@ class NodeControllerTest { void getNodeDetails_no_channels() { when(onChainCostService.getOpenCostsWith(any())).thenReturn(Coins.NONE); when(onChainCostService.getCloseCostsWith(any())).thenReturn(Coins.NONE); - when(balanceService.getBalanceInformation(any(Pubkey.class))).thenReturn(BalanceInformation.EMPTY); + when(balanceService.getBalanceInformationForPeer(any(Pubkey.class))).thenReturn(BalanceInformation.EMPTY); when(feeService.getFeeReportForPeer(any())).thenReturn(new FeeReport(Coins.NONE, Coins.NONE)); NodeDetailsDto expectedDetails = new NodeDetailsDto( PUBKEY_2, @@ -102,17 +102,17 @@ class NodeControllerTest { when(nodeService.getNode(PUBKEY_2)).thenReturn(new Node(PUBKEY_2, ALIAS_2, 0, false)); when(channelService.getOpenChannelsWith(PUBKEY_2)).thenReturn(Set.of(LOCAL_OPEN_CHANNEL_3, LOCAL_OPEN_CHANNEL)); when(channelService.getClosedChannelsWith(PUBKEY_2)).thenReturn(Set.of(CLOSED_CHANNEL_2, CLOSED_CHANNEL_3)); - when(channelService.getWaitingCloseChannelsFor(PUBKEY_2)).thenReturn( + when(channelService.getWaitingCloseChannelsWith(PUBKEY_2)).thenReturn( Set.of(WAITING_CLOSE_CHANNEL, WAITING_CLOSE_CHANNEL_2) ); - when(channelService.getForceClosingChannelsFor(PUBKEY_2)).thenReturn( + when(channelService.getForceClosingChannelsWith(PUBKEY_2)).thenReturn( Set.of(FORCE_CLOSING_CHANNEL, FORCE_CLOSING_CHANNEL_2, FORCE_CLOSING_CHANNEL_3) ); Coins openCosts = Coins.ofSatoshis(123); Coins closeCosts = Coins.ofSatoshis(456); when(onChainCostService.getOpenCostsWith(PUBKEY_2)).thenReturn(openCosts); when(onChainCostService.getCloseCostsWith(PUBKEY_2)).thenReturn(closeCosts); - when(balanceService.getBalanceInformation(PUBKEY_2)).thenReturn(BALANCE_INFORMATION); + when(balanceService.getBalanceInformationForPeer(PUBKEY_2)).thenReturn(BALANCE_INFORMATION); when(feeService.getFeeReportForPeer(PUBKEY_2)).thenReturn(FEE_REPORT); NodeDetailsDto expectedDetails = new NodeDetailsDto( PUBKEY_2, @@ -160,7 +160,7 @@ class NodeControllerTest { @Test void getBalance() { - when(balanceService.getBalanceInformation(PUBKEY)).thenReturn(BALANCE_INFORMATION); + when(balanceService.getBalanceInformationForPeer(PUBKEY)).thenReturn(BALANCE_INFORMATION); assertThat(nodeController.getBalance(PUBKEY)).isEqualTo(BalanceInformationDto.createFrom(BALANCE_INFORMATION)); } diff --git a/web/src/test/java/de/cotto/lndmanagej/controller/OnChainCostsControllerTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/OnChainCostsControllerTest.java index e2861b71..d2f48d75 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/OnChainCostsControllerTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/OnChainCostsControllerTest.java @@ -38,7 +38,7 @@ class OnChainCostsControllerTest { @Test void getOpenCostsForChannel() throws CostException { Coins coins = Coins.ofSatoshis(123); - when(onChainCostService.getOpenCosts(CHANNEL_ID)).thenReturn(Optional.of(coins)); + when(onChainCostService.getOpenCostsForChannelId(CHANNEL_ID)).thenReturn(Optional.of(coins)); assertThat(onChainCostsController.getOpenCostsForChannel(CHANNEL_ID)).isEqualTo(coins.satoshis()); } @@ -52,7 +52,7 @@ class OnChainCostsControllerTest { @Test void getCloseCostsForChannel() throws CostException { Coins coins = Coins.ofSatoshis(123); - when(onChainCostService.getCloseCosts(CHANNEL_ID)).thenReturn(Optional.of(coins)); + when(onChainCostService.getCloseCostsForChannelId(CHANNEL_ID)).thenReturn(Optional.of(coins)); assertThat(onChainCostsController.getCloseCostsForChannel(CHANNEL_ID)).isEqualTo(coins.satoshis()); }