From f43cfbfe5bfe5cb4bf2f3031cfca12d104d00eee Mon Sep 17 00:00:00 2001 From: Carsten Otto Date: Wed, 24 Nov 2021 13:05:48 +0100 Subject: [PATCH] remove unused legacy endpoints --- .../controller/LegacyControllerIT.java | 96 -------------- .../controller/LegacyController.java | 95 -------------- .../controller/LegacyControllerTest.java | 122 ------------------ 3 files changed, 313 deletions(-) diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java index 7bde52b0..bb30095b 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java @@ -1,10 +1,7 @@ package de.cotto.lndmanagej.controller; import de.cotto.lndmanagej.metrics.Metrics; -import de.cotto.lndmanagej.model.Coins; -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 org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -16,11 +13,7 @@ import java.util.Set; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_3; -import static de.cotto.lndmanagej.model.CoopClosedChannelFixtures.CLOSED_CHANNEL; import static de.cotto.lndmanagej.model.CoopClosedChannelFixtures.CLOSED_CHANNEL_3; -import static de.cotto.lndmanagej.model.FeeConfigurationFixtures.FEE_CONFIGURATION; -import static de.cotto.lndmanagej.model.ForceClosingChannelFixtures.FORCE_CLOSING_CHANNEL; -import static de.cotto.lndmanagej.model.ForceClosingChannelFixtures.FORCE_CLOSING_CHANNEL_3; import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL; import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_3; import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_TO_NODE_3; @@ -35,7 +28,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @WebMvcTest(controllers = LegacyController.class) class LegacyControllerIT { private static final String PUBKEY_BASE = "/legacy/node/" + PUBKEY; - private static final String CHANNEL_BASE = "/legacy/channel/" + CHANNEL_ID; @Autowired private MockMvc mockMvc; @@ -47,12 +39,6 @@ class LegacyControllerIT { @MockBean private ChannelService channelService; - @MockBean - private FeeService feeService; - - @MockBean - private BalanceService balanceService; - @MockBean @SuppressWarnings("unused") private Metrics metrics; @@ -64,13 +50,6 @@ class LegacyControllerIT { .andExpect(content().string(CHANNEL_ID + "\n" + CHANNEL_ID_3)); } - @Test - void getOpenChannelIds() throws Exception { - when(channelService.getOpenChannels()).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_3)); - mockMvc.perform(get("/legacy/open-channels")) - .andExpect(content().string(CHANNEL_ID + "\n" + CHANNEL_ID_3)); - } - @Test void getOpenChannelIdsPretty() throws Exception { when(channelService.getOpenChannels()).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_3)); @@ -78,85 +57,10 @@ class LegacyControllerIT { .andExpect(status().isOk()); } - @Test - void getClosedChannelIds() throws Exception { - when(channelService.getClosedChannels()).thenReturn(Set.of(CLOSED_CHANNEL, CLOSED_CHANNEL_3)); - mockMvc.perform(get("/legacy/closed-channels")) - .andExpect(content().string(CHANNEL_ID + "\n" + CHANNEL_ID_3)); - } - - @Test - void getForceClosingChannels() throws Exception { - when(channelService.getForceClosingChannels()) - .thenReturn(Set.of(FORCE_CLOSING_CHANNEL, FORCE_CLOSING_CHANNEL_3)); - mockMvc.perform(get("/legacy/force-closing-channels")) - .andExpect(content().string(CHANNEL_ID + "\n" + CHANNEL_ID_3)); - } - @Test void getPeerPubkeys() throws Exception { when(channelService.getOpenChannels()).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_TO_NODE_3)); mockMvc.perform(get("/legacy/peer-pubkeys")) .andExpect(content().string(PUBKEY_2 + "\n" + PUBKEY_3)); } - - @Test - void getOutgoingFeeRate() throws Exception { - when(feeService.getFeeConfiguration(CHANNEL_ID)).thenReturn(FEE_CONFIGURATION); - mockMvc.perform(get(CHANNEL_BASE + "/outgoing-fee-rate")) - .andExpect(content().string("1")); - } - - @Test - void getOutgoingBaseFee() throws Exception { - when(feeService.getFeeConfiguration(CHANNEL_ID)).thenReturn(FEE_CONFIGURATION); - mockMvc.perform(get(CHANNEL_BASE + "/outgoing-base-fee")) - .andExpect(content().string("2")); - } - - @Test - void getIncomingFeeRate() throws Exception { - when(feeService.getFeeConfiguration(CHANNEL_ID)).thenReturn(FEE_CONFIGURATION); - mockMvc.perform(get(CHANNEL_BASE + "/incoming-fee-rate")) - .andExpect(content().string("3")); - } - - @Test - void getIncomingBaseFee() throws Exception { - when(feeService.getFeeConfiguration(CHANNEL_ID)).thenReturn(FEE_CONFIGURATION); - mockMvc.perform(get(CHANNEL_BASE + "/incoming-base-fee")) - .andExpect(content().string("4")); - } - - @Test - void getAvailableLocalBalance_channel() throws Exception { - Coins availableBalance = Coins.ofSatoshis(999); - when(balanceService.getAvailableLocalBalance(CHANNEL_ID)).thenReturn(availableBalance); - mockMvc.perform(get(CHANNEL_BASE + "/available-local-balance")) - .andExpect(content().string(String.valueOf(availableBalance.satoshis()))); - } - - @Test - void getAvailableRemoteBalance_channel() throws Exception { - Coins availableBalance = Coins.ofSatoshis(999); - when(balanceService.getAvailableRemoteBalance(CHANNEL_ID)).thenReturn(availableBalance); - mockMvc.perform(get(CHANNEL_BASE + "/available-remote-balance")) - .andExpect(content().string(String.valueOf(availableBalance.satoshis()))); - } - - @Test - void getAvailableLocalBalance_peer() throws Exception { - Coins availableBalance = Coins.ofSatoshis(999); - when(balanceService.getAvailableLocalBalance(PUBKEY)).thenReturn(availableBalance); - mockMvc.perform(get(PUBKEY_BASE + "/available-local-balance")) - .andExpect(content().string(String.valueOf(availableBalance.satoshis()))); - } - - @Test - void getAvailableRemoteBalance_peer() throws Exception { - Coins availableBalance = Coins.ofSatoshis(999); - when(balanceService.getAvailableRemoteBalance(PUBKEY)).thenReturn(availableBalance); - mockMvc.perform(get(PUBKEY_BASE + "/available-remote-balance")) - .andExpect(content().string(String.valueOf(availableBalance.satoshis()))); - } } \ No newline at end of file diff --git a/web/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java b/web/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java index 1f4e5d8a..b08d635a 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java @@ -6,9 +6,7 @@ import de.cotto.lndmanagej.model.Channel; import de.cotto.lndmanagej.model.ChannelId; import de.cotto.lndmanagej.model.LocalOpenChannel; import de.cotto.lndmanagej.model.Pubkey; -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 org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -17,7 +15,6 @@ import org.springframework.web.bind.annotation.RestController; import java.util.Comparator; import java.util.stream.Collectors; -import java.util.stream.Stream; @RestController @RequestMapping("/legacy") @@ -25,21 +22,15 @@ public class LegacyController { private static final String NEWLINE = "\n"; private final NodeService nodeService; private final ChannelService channelService; - private final FeeService feeService; - private final BalanceService balanceService; private final Metrics metrics; public LegacyController( NodeService nodeService, ChannelService channelService, - FeeService feeService, - BalanceService balanceService, Metrics metrics ) { this.nodeService = nodeService; this.channelService = channelService; - this.feeService = feeService; - this.balanceService = balanceService; this.metrics = metrics; } @@ -53,14 +44,6 @@ public class LegacyController { .collect(Collectors.joining(NEWLINE)); } - @GetMapping("/open-channels") - public String getOpenChannelIds() { - mark("getOpenChannelIds"); - return getOpenChannelIdsSorted() - .map(ChannelId::toString) - .collect(Collectors.joining(NEWLINE)); - } - @GetMapping("/open-channels/pretty") public String getOpenChannelIdsPretty() { mark("getOpenChannelIdsPretty"); @@ -76,24 +59,6 @@ public class LegacyController { .collect(Collectors.joining(NEWLINE)); } - @GetMapping("/closed-channels") - public String getClosedChannelIds() { - mark("getClosedChannelIds"); - return getClosedChannelIdsSorted() - .map(ChannelId::toString) - .collect(Collectors.joining(NEWLINE)); - } - - @GetMapping("/force-closing-channels") - public String getForceClosingChannelIds() { - mark("getForceClosingChannelIds"); - return channelService.getForceClosingChannels().stream() - .map(Channel::getId) - .sorted() - .map(ChannelId::toString) - .collect(Collectors.joining(NEWLINE)); - } - @GetMapping("/peer-pubkeys") public String getPeerPubkeys() { mark("getPeerPubkeys"); @@ -105,66 +70,6 @@ public class LegacyController { .collect(Collectors.joining(NEWLINE)); } - @GetMapping("/channel/{channelId}/incoming-fee-rate") - public long getIncomingFeeRate(@PathVariable ChannelId channelId) { - mark("getIncomingFeeRate"); - return feeService.getFeeConfiguration(channelId).incomingFeeRate(); - } - - @GetMapping("/channel/{channelId}/outgoing-fee-rate") - public long getOutgoingFeeRate(@PathVariable ChannelId channelId) { - mark("getOutgoingFeeRate"); - return feeService.getFeeConfiguration(channelId).outgoingFeeRate(); - } - - @GetMapping("/channel/{channelId}/incoming-base-fee") - public long getIncomingBaseFee(@PathVariable ChannelId channelId) { - mark("getIncomingBaseFee"); - return feeService.getFeeConfiguration(channelId).incomingBaseFee().milliSatoshis(); - } - - @GetMapping("/channel/{channelId}/outgoing-base-fee") - public long getOutgoingBaseFee(@PathVariable ChannelId channelId) { - mark("getOutgoingBaseFee"); - return feeService.getFeeConfiguration(channelId).outgoingBaseFee().milliSatoshis(); - } - - @GetMapping("/channel/{channelId}/available-local-balance") - public long getAvailableLocalBalanceForChannel(@PathVariable ChannelId channelId) { - mark("getAvailableLocalBalanceForChannel"); - return balanceService.getAvailableLocalBalance(channelId).satoshis(); - } - - @GetMapping("/channel/{channelId}/available-remote-balance") - public long getAvailableRemoteBalanceForChannel(@PathVariable ChannelId channelId) { - mark("getAvailableRemoteBalanceForChannel"); - return balanceService.getAvailableRemoteBalance(channelId).satoshis(); - } - - @GetMapping("/node/{pubkey}/available-local-balance") - public long getAvailableLocalBalanceForPeer(@PathVariable Pubkey pubkey) { - mark("getAvailableLocalBalanceForPeer"); - return balanceService.getAvailableLocalBalance(pubkey).satoshis(); - } - - @GetMapping("/node/{pubkey}/available-remote-balance") - public long getAvailableRemoteBalanceForPeer(@PathVariable Pubkey pubkey) { - mark("getAvailableRemoteBalanceForPeer"); - return balanceService.getAvailableRemoteBalance(pubkey).satoshis(); - } - - private Stream getOpenChannelIdsSorted() { - return channelService.getOpenChannels().stream() - .map(Channel::getId) - .sorted(); - } - - private Stream getClosedChannelIdsSorted() { - return channelService.getClosedChannels().stream() - .map(Channel::getId) - .sorted(); - } - private void mark(String name) { metrics.mark(MetricRegistry.name(getClass(), name)); } diff --git a/web/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java index 4acd67fb..953f927a 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java @@ -1,11 +1,7 @@ package de.cotto.lndmanagej.controller; import de.cotto.lndmanagej.metrics.Metrics; -import de.cotto.lndmanagej.model.Coins; -import de.cotto.lndmanagej.model.FeeConfigurationFixtures; -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 org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -21,13 +17,9 @@ import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_3; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_COMPACT; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_COMPACT_4; -import static de.cotto.lndmanagej.model.CoopClosedChannelFixtures.CLOSED_CHANNEL; import static de.cotto.lndmanagej.model.CoopClosedChannelFixtures.CLOSED_CHANNEL_3; -import static de.cotto.lndmanagej.model.ForceClosingChannelFixtures.FORCE_CLOSING_CHANNEL; -import static de.cotto.lndmanagej.model.ForceClosingChannelFixtures.FORCE_CLOSING_CHANNEL_3; import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL; 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.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_TO_NODE_3; import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS_2; import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS_3; @@ -50,12 +42,6 @@ class LegacyControllerTest { @Mock private ChannelService channelService; - @Mock - private FeeService feeService; - - @Mock - private BalanceService balanceService; - @Mock private Metrics metrics; @@ -76,23 +62,6 @@ class LegacyControllerTest { ); } - @Test - void getOpenChannelIds() { - when(channelService.getOpenChannels()).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_3)); - assertThat(legacyController.getOpenChannelIds()).isEqualTo( - CHANNEL_ID + "\n" + CHANNEL_ID_3 - ); - verify(metrics).mark(argThat(name -> name.endsWith(".getOpenChannelIds"))); - } - - @Test - void getOpenChannelIds_ordered() { - when(channelService.getOpenChannels()).thenReturn(Set.of(LOCAL_OPEN_CHANNEL_3, LOCAL_OPEN_CHANNEL)); - assertThat(legacyController.getOpenChannelIds()).isEqualTo( - CHANNEL_ID + "\n" + CHANNEL_ID_3 - ); - } - @Test void getOpenChannelIdsPretty() { when(nodeService.getAlias(PUBKEY_2)).thenReturn(ALIAS_2); @@ -112,42 +81,6 @@ class LegacyControllerTest { .matches(CHANNEL_ID_COMPACT + ".*\n" + CHANNEL_ID_COMPACT_4 + ".*"); } - @Test - void getClosedChannelIds() { - when(channelService.getClosedChannels()).thenReturn(Set.of(CLOSED_CHANNEL, CLOSED_CHANNEL_3)); - assertThat(legacyController.getClosedChannelIds()).isEqualTo( - CHANNEL_ID + "\n" + CHANNEL_ID_3 - ); - verify(metrics).mark(argThat(name -> name.endsWith(".getClosedChannelIds"))); - } - - @Test - void getClosedChannelIds_ordered() { - when(channelService.getClosedChannels()).thenReturn(Set.of(CLOSED_CHANNEL_3, CLOSED_CHANNEL)); - assertThat(legacyController.getClosedChannelIds()).isEqualTo( - CHANNEL_ID + "\n" + CHANNEL_ID_3 - ); - } - - @Test - void getForceClosingChannelIds() { - when(channelService.getForceClosingChannels()) - .thenReturn(Set.of(FORCE_CLOSING_CHANNEL, FORCE_CLOSING_CHANNEL_3)); - assertThat(legacyController.getForceClosingChannelIds()).isEqualTo( - CHANNEL_ID + "\n" + CHANNEL_ID_3 - ); - verify(metrics).mark(argThat(name -> name.endsWith(".getForceClosingChannelIds"))); - } - - @Test - void getForceClosingChannelIds_ordered() { - when(channelService.getForceClosingChannels()) - .thenReturn(Set.of(FORCE_CLOSING_CHANNEL_3, FORCE_CLOSING_CHANNEL)); - assertThat(legacyController.getForceClosingChannelIds()).isEqualTo( - CHANNEL_ID + "\n" + CHANNEL_ID_3 - ); - } - @Test void getPeerPubkeys() { when(channelService.getOpenChannels()).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_TO_NODE_3)); @@ -167,59 +100,4 @@ class LegacyControllerTest { assertThat(legacyController.getPeerPubkeys()).isEqualTo(PUBKEY_2.toString()); } - @Test - void getOutgoingFeeRate() { - when(feeService.getFeeConfiguration(CHANNEL_ID)).thenReturn(FeeConfigurationFixtures.FEE_CONFIGURATION); - assertThat(legacyController.getOutgoingFeeRate(CHANNEL_ID)).isEqualTo(1); - verify(metrics).mark(argThat(name -> name.endsWith(".getOutgoingFeeRate"))); - } - - @Test - void getOutgoingBaseFee() { - when(feeService.getFeeConfiguration(CHANNEL_ID)).thenReturn(FeeConfigurationFixtures.FEE_CONFIGURATION); - assertThat(legacyController.getOutgoingBaseFee(CHANNEL_ID)).isEqualTo(2); - verify(metrics).mark(argThat(name -> name.endsWith(".getOutgoingBaseFee"))); - } - - @Test - void getIncomingFeeRate() { - when(feeService.getFeeConfiguration(CHANNEL_ID)).thenReturn(FeeConfigurationFixtures.FEE_CONFIGURATION); - assertThat(legacyController.getIncomingFeeRate(CHANNEL_ID)).isEqualTo(3); - verify(metrics).mark(argThat(name -> name.endsWith(".getIncomingFeeRate"))); - } - - @Test - void getIncomingBaseFee() { - when(feeService.getFeeConfiguration(CHANNEL_ID)).thenReturn(FeeConfigurationFixtures.FEE_CONFIGURATION); - assertThat(legacyController.getIncomingBaseFee(CHANNEL_ID)).isEqualTo(4); - verify(metrics).mark(argThat(name -> name.endsWith(".getIncomingBaseFee"))); - } - - @Test - void getAvailableLocalBalance_channel() { - when(balanceService.getAvailableLocalBalance(CHANNEL_ID)).thenReturn(Coins.ofSatoshis(123L)); - assertThat(legacyController.getAvailableLocalBalanceForChannel(CHANNEL_ID)).isEqualTo(123); - verify(metrics).mark(argThat(name -> name.endsWith(".getAvailableLocalBalanceForChannel"))); - } - - @Test - void getAvailableRemoteBalance_channel() { - when(balanceService.getAvailableRemoteBalance(CHANNEL_ID)).thenReturn(Coins.ofSatoshis(123L)); - assertThat(legacyController.getAvailableRemoteBalanceForChannel(CHANNEL_ID)).isEqualTo(123); - verify(metrics).mark(argThat(name -> name.endsWith(".getAvailableRemoteBalanceForChannel"))); - } - - @Test - void getAvailableLocalBalance_peer() { - when(balanceService.getAvailableLocalBalance(PUBKEY)).thenReturn(Coins.ofSatoshis(246L)); - assertThat(legacyController.getAvailableLocalBalanceForPeer(PUBKEY)).isEqualTo(246); - verify(metrics).mark(argThat(name -> name.endsWith(".getAvailableLocalBalanceForPeer"))); - } - - @Test - void getAvailableRemoteBalance_peer() { - when(balanceService.getAvailableRemoteBalance(PUBKEY)).thenReturn(Coins.ofSatoshis(246L)); - assertThat(legacyController.getAvailableRemoteBalanceForPeer(PUBKEY)).isEqualTo(246); - verify(metrics).mark(argThat(name -> name.endsWith(".getAvailableRemoteBalanceForPeer"))); - } } \ No newline at end of file