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 bb30095b..5a6deba9 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java @@ -16,10 +16,7 @@ import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_3; import static de.cotto.lndmanagej.model.CoopClosedChannelFixtures.CLOSED_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; import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY; -import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_2; -import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_3; import static org.mockito.Mockito.when; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; @@ -56,11 +53,4 @@ class LegacyControllerIT { mockMvc.perform(get("/legacy/open-channels/pretty")) .andExpect(status().isOk()); } - - @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)); - } } \ 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 b08d635a..9f68cee9 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java @@ -59,17 +59,6 @@ public class LegacyController { .collect(Collectors.joining(NEWLINE)); } - @GetMapping("/peer-pubkeys") - public String getPeerPubkeys() { - mark("getPeerPubkeys"); - return channelService.getOpenChannels().stream() - .map(LocalOpenChannel::getRemotePubkey) - .map(Pubkey::toString) - .sorted() - .distinct() - .collect(Collectors.joining(NEWLINE)); - } - 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 953f927a..4ad88d98 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java @@ -19,7 +19,6 @@ 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_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_TO_NODE_3; import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS_2; import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS_3; @@ -80,24 +79,4 @@ class LegacyControllerTest { assertThat(legacyController.getOpenChannelIdsPretty()) .matches(CHANNEL_ID_COMPACT + ".*\n" + CHANNEL_ID_COMPACT_4 + ".*"); } - - @Test - void getPeerPubkeys() { - when(channelService.getOpenChannels()).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_TO_NODE_3)); - assertThat(legacyController.getPeerPubkeys()).isEqualTo(PUBKEY_2 + "\n" + PUBKEY_3); - verify(metrics).mark(argThat(name -> name.endsWith(".getPeerPubkeys"))); - } - - @Test - void getPeerPubkeys_sorted() { - when(channelService.getOpenChannels()).thenReturn(Set.of(LOCAL_OPEN_CHANNEL_TO_NODE_3, LOCAL_OPEN_CHANNEL)); - assertThat(legacyController.getPeerPubkeys()).isEqualTo(PUBKEY_2 + "\n" + PUBKEY_3); - } - - @Test - void getPeerPubkeys_without_duplicates() { - when(channelService.getOpenChannels()).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_2)); - assertThat(legacyController.getPeerPubkeys()).isEqualTo(PUBKEY_2.toString()); - } - } \ No newline at end of file