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 5a6deba9..8b412ca1 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java @@ -11,21 +11,14 @@ import org.springframework.test.web.servlet.MockMvc; 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_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.PubkeyFixtures.PUBKEY; 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; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @WebMvcTest(controllers = LegacyController.class) class LegacyControllerIT { - private static final String PUBKEY_BASE = "/legacy/node/" + PUBKEY; - @Autowired private MockMvc mockMvc; @@ -40,13 +33,6 @@ class LegacyControllerIT { @SuppressWarnings("unused") private Metrics metrics; - @Test - void getAllChannelIds_for_peer() throws Exception { - when(channelService.getAllChannelsWith(PUBKEY)).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, CLOSED_CHANNEL_3)); - mockMvc.perform(get(PUBKEY_BASE + "/all-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)); 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 9f68cee9..01c6687c 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java @@ -2,14 +2,11 @@ package de.cotto.lndmanagej.controller; import com.codahale.metrics.MetricRegistry; import de.cotto.lndmanagej.metrics.Metrics; -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.ChannelService; import de.cotto.lndmanagej.service.NodeService; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -34,19 +31,9 @@ public class LegacyController { this.metrics = metrics; } - @GetMapping("/node/{pubkey}/all-channels") - public String getAllChannelIdsForPubkey(@PathVariable Pubkey pubkey) { - mark("getAllChannelIdsForPubkey"); - return channelService.getAllChannelsWith(pubkey).stream() - .map(Channel::getId) - .sorted() - .map(ChannelId::toString) - .collect(Collectors.joining(NEWLINE)); - } - @GetMapping("/open-channels/pretty") public String getOpenChannelIdsPretty() { - mark("getOpenChannelIdsPretty"); + metrics.mark(MetricRegistry.name(getClass(), "getOpenChannelIdsPretty")); return channelService.getOpenChannels().stream() .sorted(Comparator.comparing(LocalOpenChannel::getId)) .map(localOpenChannel -> { @@ -58,8 +45,4 @@ public class LegacyController { }) .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 4ad88d98..1e1fed59 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java @@ -13,16 +13,12 @@ import java.util.Set; import static de.cotto.lndmanagej.model.ChannelFixtures.CAPACITY; import static de.cotto.lndmanagej.model.ChannelFixtures.CAPACITY_2; -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_3; import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL; 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; -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.assertj.core.api.Assertions.assertThat; @@ -44,23 +40,6 @@ class LegacyControllerTest { @Mock private Metrics metrics; - @Test - void getAllChannelIds_for_peer() { - when(channelService.getAllChannelsWith(PUBKEY)).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, CLOSED_CHANNEL_3)); - assertThat(legacyController.getAllChannelIdsForPubkey(PUBKEY)).isEqualTo( - CHANNEL_ID + "\n" + CHANNEL_ID_3 - ); - verify(metrics).mark(argThat(name -> name.endsWith(".getAllChannelIdsForPubkey"))); - } - - @Test - void getAllChannelIds_for_peer_ordered() { - when(channelService.getAllChannelsWith(PUBKEY)).thenReturn(Set.of(CLOSED_CHANNEL_3, LOCAL_OPEN_CHANNEL)); - assertThat(legacyController.getAllChannelIdsForPubkey(PUBKEY)).isEqualTo( - CHANNEL_ID + "\n" + CHANNEL_ID_3 - ); - } - @Test void getOpenChannelIdsPretty() { when(nodeService.getAlias(PUBKEY_2)).thenReturn(ALIAS_2);