diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerTest.java b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerTest.java index 85c01418..edccef73 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerTest.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerTest.java @@ -1,13 +1,13 @@ package de.cotto.lndmanagej.ui; import de.cotto.lndmanagej.controller.ChannelIdConverter; -import de.cotto.lndmanagej.ui.dto.StatusModel; -import de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture; import de.cotto.lndmanagej.ui.controller.DashboardController; import de.cotto.lndmanagej.ui.dto.NodeDto; import de.cotto.lndmanagej.ui.dto.OpenChannelDto; -import de.cotto.lndmanagej.ui.page.general.DashboardPage; +import de.cotto.lndmanagej.ui.dto.StatusModel; +import de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture; import de.cotto.lndmanagej.ui.page.PageService; +import de.cotto.lndmanagej.ui.page.general.DashboardPage; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; @@ -36,7 +36,9 @@ class DashboardControllerTest { @Test void testEmptyDashboard() throws Exception { - given(this.pageService.dashboard()).willReturn(new DashboardPage(List.of(), List.of(), new StatusModel(true, 1, NONE))); + given(this.pageService.dashboard()).willReturn( + new DashboardPage(List.of(), List.of(), new StatusModel(true, 1, NONE)) + ); mockMvc.perform(MockMvcRequestBuilders.get("/")).andExpect(status().isOk()); } @@ -44,7 +46,9 @@ class DashboardControllerTest { void testDashboard() throws Exception { OpenChannelDto channel = OpenChannelDtoFixture.OPEN_CHANNEL_DTO; NodeDto node = new NodeDto(channel.remotePubkey().toString(), channel.remoteAlias(), true); - given(this.pageService.dashboard()).willReturn(new DashboardPage(List.of(channel), List.of(node), new StatusModel(true, 1, NONE))); + given(this.pageService.dashboard()).willReturn( + new DashboardPage(List.of(channel), List.of(node), new StatusModel(true, 1, NONE)) + ); mockMvc.perform(MockMvcRequestBuilders.get("/")).andExpect(status().isOk()); } } diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/NodeDetailsControllerTest.java b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/NodeDetailsControllerTest.java index 5961ca03..b31a579d 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/NodeDetailsControllerTest.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/NodeDetailsControllerTest.java @@ -32,7 +32,7 @@ class NodeDetailsControllerTest { @Test void testNodeDetailsPage() throws Exception { given(this.pageService.nodeDetails(any())).willReturn(new NodeDetailsPage(NODE_DETAILS_DTO)); - mockMvc.perform(MockMvcRequestBuilders.get("/node/027abc123abc123abc123abc123123abc123abc123abc123abc123abc123abc121")) + mockMvc.perform(MockMvcRequestBuilders.get("/node/" + NODE_DETAILS_DTO.node().toString())) .andExpect(status().isOk()); } } diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerTest.java b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerTest.java index 316590ac..e64efdb6 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerTest.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerTest.java @@ -1,9 +1,10 @@ package de.cotto.lndmanagej.ui; import de.cotto.lndmanagej.controller.ChannelIdConverter; +import de.cotto.lndmanagej.ui.controller.SearchController; +import de.cotto.lndmanagej.ui.dto.OpenChannelDto; import de.cotto.lndmanagej.ui.model.NodeDtoFixture; import de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture; -import de.cotto.lndmanagej.ui.controller.SearchController; import de.cotto.lndmanagej.ui.page.PageService; import de.cotto.lndmanagej.ui.page.channel.ChannelDetailsPage; import de.cotto.lndmanagej.ui.page.general.ErrorPage; @@ -25,7 +26,9 @@ import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.WOS; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; @WebMvcTest(controllers = SearchController.class) class SearchControllerTest { @@ -55,9 +58,11 @@ class SearchControllerTest { @Test void searchForChannelId_viaShortChannelId_found() throws Exception { - given(this.dataService.getOpenChannels()).willReturn(List.of(OpenChannelDtoFixture.createFrom(CHAN_DETAILS_DTO))); + given(this.dataService.getOpenChannels()).willReturn( + List.of(OpenChannelDtoFixture.createFrom(CHAN_DETAILS_DTO)) + ); given(this.pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHAN_DETAILS_DTO)); - mockMvc.perform(MockMvcRequestBuilders.get("/search?q=783231610496155649") ) + mockMvc.perform(MockMvcRequestBuilders.get("/search?q=783231610496155649")) .andExpect(status().isOk()) .andExpect(model().attribute("id", is(CHAN_DETAILS_DTO.channelId()))) .andExpect(view().name("channel-details")); @@ -65,9 +70,11 @@ class SearchControllerTest { @Test void searchForChannelId_viaCompactChannelId_found() throws Exception { - given(this.dataService.getOpenChannels()).willReturn(List.of(OpenChannelDtoFixture.createFrom(CHAN_DETAILS_DTO))); + given(this.dataService.getOpenChannels()).willReturn( + List.of(OpenChannelDtoFixture.createFrom(CHAN_DETAILS_DTO)) + ); given(this.pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHAN_DETAILS_DTO)); - mockMvc.perform(MockMvcRequestBuilders.get("/search?q=712345x123x1") ) + mockMvc.perform(MockMvcRequestBuilders.get("/search?q=712345x123x1")) .andExpect(status().isOk()) .andExpect(model().attribute("id", is(CHAN_DETAILS_DTO.channelId()))) .andExpect(view().name("channel-details")); @@ -77,7 +84,7 @@ class SearchControllerTest { void searchForPubkey_found() throws Exception { given(this.dataService.getOpenChannels()).willReturn(List.of(OPEN_CHANNEL_DTO)); given(this.pageService.nodeDetails(any())).willReturn(new NodeDetailsPage(NODE_DETAILS_DTO)); - mockMvc.perform(MockMvcRequestBuilders.get("/search?q=027abc123abc123abc123abc123123abc123abc123abc123abc123abc123abc121")) + mockMvc.perform(MockMvcRequestBuilders.get("/search?q=" + NODE_DETAILS_DTO.node().toString())) .andExpect(status().isOk()) .andExpect(model().attribute("pubkey", is(OPEN_CHANNEL_DTO.remotePubkey()))) .andExpect(view().name("node-details")); @@ -95,12 +102,17 @@ class SearchControllerTest { @Test void searchForAlias_TwoNodesFound() throws Exception { - given(this.dataService.getOpenChannels()).willReturn(List.of(OPEN_CHANNEL_DTO, WOS)); //ALbert, wALletofsatotoshi - given(this.pageService.nodes(any())).willReturn(new NodesPage(List.of(NodeDtoFixture.createFrom(OPEN_CHANNEL_DTO), NodeDtoFixture.createFrom(WOS)))); + given(this.dataService.getOpenChannels()).willReturn(List.of(OPEN_CHANNEL_DTO, WOS)); + given(this.pageService.nodes(any())).willReturn(nodesPage(OPEN_CHANNEL_DTO, WOS) + ); mockMvc.perform(MockMvcRequestBuilders.get("/search?q=al")) .andExpect(status().isOk()) .andExpect(model().attributeExists("nodes")) .andExpect(view().name("nodes")); } + private NodesPage nodesPage(OpenChannelDto channel1, OpenChannelDto channel2) { + return new NodesPage(List.of(NodeDtoFixture.createFrom(channel1), NodeDtoFixture.createFrom(channel2))); + } + } diff --git a/web/src/main/java/de/cotto/lndmanagej/UiDataServiceImpl.java b/web/src/main/java/de/cotto/lndmanagej/UiDataServiceImpl.java index c5fa07bf..61af5e56 100644 --- a/web/src/main/java/de/cotto/lndmanagej/UiDataServiceImpl.java +++ b/web/src/main/java/de/cotto/lndmanagej/UiDataServiceImpl.java @@ -1,8 +1,19 @@ package de.cotto.lndmanagej; -import de.cotto.lndmanagej.controller.*; -import de.cotto.lndmanagej.controller.dto.*; -import de.cotto.lndmanagej.model.*; +import de.cotto.lndmanagej.controller.ChannelController; +import de.cotto.lndmanagej.controller.NodeController; +import de.cotto.lndmanagej.controller.NotFoundException; +import de.cotto.lndmanagej.controller.StatusController; +import de.cotto.lndmanagej.controller.WarningsController; +import de.cotto.lndmanagej.controller.dto.BalanceInformationDto; +import de.cotto.lndmanagej.controller.dto.ChannelDetailsDto; +import de.cotto.lndmanagej.controller.dto.ChannelsDto; +import de.cotto.lndmanagej.controller.dto.NodeDetailsDto; +import de.cotto.lndmanagej.controller.dto.PoliciesDto; +import de.cotto.lndmanagej.model.ChannelId; +import de.cotto.lndmanagej.model.LocalChannel; +import de.cotto.lndmanagej.model.Node; +import de.cotto.lndmanagej.model.Pubkey; import de.cotto.lndmanagej.service.ChannelService; import de.cotto.lndmanagej.service.NodeService; import de.cotto.lndmanagej.ui.UiDataService; diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/UiDataService.java b/web/src/main/java/de/cotto/lndmanagej/ui/UiDataService.java index ea186748..65e94787 100644 --- a/web/src/main/java/de/cotto/lndmanagej/ui/UiDataService.java +++ b/web/src/main/java/de/cotto/lndmanagej/ui/UiDataService.java @@ -2,13 +2,16 @@ package de.cotto.lndmanagej.ui; import de.cotto.lndmanagej.controller.NotFoundException; import de.cotto.lndmanagej.controller.dto.NodeDetailsDto; -import de.cotto.lndmanagej.model.*; +import de.cotto.lndmanagej.model.ChannelId; +import de.cotto.lndmanagej.model.Pubkey; import de.cotto.lndmanagej.ui.dto.ChanDetailsDto; import de.cotto.lndmanagej.ui.dto.NodeDto; import de.cotto.lndmanagej.ui.dto.OpenChannelDto; import de.cotto.lndmanagej.ui.dto.StatusModel; -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.Set; import java.util.stream.Collectors; public abstract class UiDataService { diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/controller/DashboardController.java b/web/src/main/java/de/cotto/lndmanagej/ui/controller/DashboardController.java index 868ef95c..7d102b09 100644 --- a/web/src/main/java/de/cotto/lndmanagej/ui/controller/DashboardController.java +++ b/web/src/main/java/de/cotto/lndmanagej/ui/controller/DashboardController.java @@ -1,15 +1,9 @@ package de.cotto.lndmanagej.ui.controller; -import de.cotto.lndmanagej.controller.NotFoundException; -import de.cotto.lndmanagej.model.ChannelId; -import de.cotto.lndmanagej.model.Pubkey; import de.cotto.lndmanagej.ui.page.PageService; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; - -import java.util.NoSuchElementException; @Controller public class DashboardController { diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/controller/SearchController.java b/web/src/main/java/de/cotto/lndmanagej/ui/controller/SearchController.java index fee168a5..0bfc2ccb 100644 --- a/web/src/main/java/de/cotto/lndmanagej/ui/controller/SearchController.java +++ b/web/src/main/java/de/cotto/lndmanagej/ui/controller/SearchController.java @@ -11,7 +11,6 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; -import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Optional; @@ -32,21 +31,21 @@ public class SearchController { public String search(@RequestParam(name = "q") String query, Model model) { List openChannels = dataService.getOpenChannels(); - Optional channel = openChannels.stream() - .filter(c -> String.valueOf(c.channelId().getShortChannelId()).equals(query) || c.channelId().toString().equals(query)) + Optional openChannel = openChannels.stream() + .filter(channel -> String.valueOf(channel.channelId().getShortChannelId()).equals(query) + || channel.channelId().toString().equals(query)) .findFirst(); - if (channel.isPresent()) { + if (openChannel.isPresent()) { - ChannelId channelId = query.contains("x") ? ChannelId.fromCompactForm(query) : ChannelId.fromShortChannelId(Long.parseLong(query)); - return detailsPage(channelId, model); + return detailsPage(extractChannelId(query), model); } - channel = openChannels.stream() + openChannel = openChannels.stream() .filter(c -> c.remotePubkey().toString().equals(query)) .findFirst(); - if (channel.isPresent()) { + if (openChannel.isPresent()) { return page.nodeDetails(Pubkey.create(query)).create(model); } @@ -74,4 +73,9 @@ public class SearchController { } } + private ChannelId extractChannelId(String query) { + return query.contains("x") + ? ChannelId.fromCompactForm(query) : ChannelId.fromShortChannelId(Long.parseLong(query)); + } + } \ No newline at end of file diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/dto/ChanDetailsDto.java b/web/src/main/java/de/cotto/lndmanagej/ui/dto/ChanDetailsDto.java index e056d2a1..b2d574c5 100644 --- a/web/src/main/java/de/cotto/lndmanagej/ui/dto/ChanDetailsDto.java +++ b/web/src/main/java/de/cotto/lndmanagej/ui/dto/ChanDetailsDto.java @@ -1,6 +1,11 @@ package de.cotto.lndmanagej.ui.dto; -import de.cotto.lndmanagej.controller.dto.*; +import de.cotto.lndmanagej.controller.dto.BalanceInformationDto; +import de.cotto.lndmanagej.controller.dto.FeeReportDto; +import de.cotto.lndmanagej.controller.dto.FlowReportDto; +import de.cotto.lndmanagej.controller.dto.OnChainCostsDto; +import de.cotto.lndmanagej.controller.dto.PoliciesDto; +import de.cotto.lndmanagej.controller.dto.RebalanceReportDto; import de.cotto.lndmanagej.model.ChannelId; import de.cotto.lndmanagej.model.OpenInitiator; import de.cotto.lndmanagej.model.Pubkey; diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/page/node/NodeDetailsPage.java b/web/src/main/java/de/cotto/lndmanagej/ui/page/node/NodeDetailsPage.java index dc7ad7ee..f1fd2e9b 100644 --- a/web/src/main/java/de/cotto/lndmanagej/ui/page/node/NodeDetailsPage.java +++ b/web/src/main/java/de/cotto/lndmanagej/ui/page/node/NodeDetailsPage.java @@ -6,7 +6,7 @@ import de.cotto.lndmanagej.ui.page.general.ThymeleafPage; public class NodeDetailsPage extends ThymeleafPage { public NodeDetailsPage(NodeDetailsDto nodeDetails) { add("pubkey", nodeDetails.node()); - add( "node", nodeDetails); + add("node", nodeDetails); } @Override diff --git a/web/src/test/java/de/cotto/lndmanagej/DemoApplication.java b/web/src/test/java/de/cotto/lndmanagej/DemoApplication.java index 67e9981e..80e253dd 100644 --- a/web/src/test/java/de/cotto/lndmanagej/DemoApplication.java +++ b/web/src/test/java/de/cotto/lndmanagej/DemoApplication.java @@ -1,7 +1,24 @@ package de.cotto.lndmanagej; -import de.cotto.lndmanagej.controller.dto.*; -import de.cotto.lndmanagej.model.*; +import de.cotto.lndmanagej.controller.dto.BalanceInformationDto; +import de.cotto.lndmanagej.controller.dto.ChannelWithWarningsDto; +import de.cotto.lndmanagej.controller.dto.FeeReportDto; +import de.cotto.lndmanagej.controller.dto.FlowReportDto; +import de.cotto.lndmanagej.controller.dto.NodeDetailsDto; +import de.cotto.lndmanagej.controller.dto.NodeWithWarningsDto; +import de.cotto.lndmanagej.controller.dto.NodesAndChannelsWithWarningsDto; +import de.cotto.lndmanagej.controller.dto.OnChainCostsDto; +import de.cotto.lndmanagej.controller.dto.OnlineReportDto; +import de.cotto.lndmanagej.controller.dto.RebalanceReportDto; +import de.cotto.lndmanagej.model.ChannelId; +import de.cotto.lndmanagej.model.ChannelIdFixtures; +import de.cotto.lndmanagej.model.FeeReportFixtures; +import de.cotto.lndmanagej.model.FlowReportFixtures; +import de.cotto.lndmanagej.model.OnlineReport; +import de.cotto.lndmanagej.model.OnlineReportFixtures; +import de.cotto.lndmanagej.model.OpenInitiator; +import de.cotto.lndmanagej.model.Pubkey; +import de.cotto.lndmanagej.model.RebalanceReportFixtures; import de.cotto.lndmanagej.model.warnings.ChannelWarningsFixtures; import de.cotto.lndmanagej.model.warnings.NodeWarningsFixtures; import de.cotto.lndmanagej.model.warnings.Warning; @@ -23,19 +40,26 @@ import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; import java.util.List; -import java.util.Set; import java.util.stream.Collectors; import static de.cotto.lndmanagej.model.BalanceInformationFixtures.BALANCE_INFORMATION; import static de.cotto.lndmanagej.model.OnChainCostsFixtures.ON_CHAIN_COSTS; -import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.*; +import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.ACINQ; +import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.ACINQ2; +import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.BCASH; +import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.COTTO; +import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.OPEN_CHANNEL_DTO; +import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.WOS; +import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.WOS2; @Configuration -@EnableAutoConfiguration(exclude = { - DataSourceAutoConfiguration.class, - DataSourceTransactionManagerAutoConfiguration.class, - HibernateJpaAutoConfiguration.class -}) +@EnableAutoConfiguration( + exclude = { + DataSourceAutoConfiguration.class, + DataSourceTransactionManagerAutoConfiguration.class, + HibernateJpaAutoConfiguration.class + } +) @ComponentScan("de.cotto.lndmanagej.ui") public class DemoApplication { @@ -55,8 +79,8 @@ public class DemoApplication { private NodesAndChannelsWithWarningsDto createNodeWarnings() { return new NodesAndChannelsWithWarningsDto( List.of(new NodeWithWarningsDto(NodeWarningsFixtures.NODE_WARNINGS.warnings().stream() - .map(Warning::description) - .collect(Collectors.toSet()), WOS.remoteAlias(), WOS.remotePubkey()), + .map(Warning::description) + .collect(Collectors.toSet()), WOS.remoteAlias(), WOS.remotePubkey()), new NodeWithWarningsDto(NodeWarningsFixtures.NODE_WARNINGS.warnings().stream() .map(Warning::description) .collect(Collectors.toSet()), ACINQ.remoteAlias(), ACINQ.remotePubkey()) @@ -75,11 +99,14 @@ public class DemoApplication { @Override public ChanDetailsDto getChannelDetails(ChannelId channelId) { - OpenChannelDto localOpenChannel = getOpenChannels().stream().filter(c -> c.channelId().equals(channelId)).findFirst().orElseThrow(); - return createNodeDetails(localOpenChannel); + OpenChannelDto localOpenChannel = getOpenChannels().stream() + .filter(c -> c.channelId().equals(channelId)) + .findFirst() + .orElseThrow(); + return createChannelDetails(localOpenChannel); } - private ChanDetailsDto createNodeDetails(OpenChannelDto channel) { + private ChanDetailsDto createChannelDetails(OpenChannelDto channel) { return new ChanDetailsDto( channel.channelId(), channel.remotePubkey(), @@ -97,8 +124,8 @@ public class DemoApplication { @Override public NodeDto getNode(Pubkey pubkey) { return getOpenChannels().stream() - .filter(c -> c.remotePubkey().equals(pubkey)) - .map(c -> new NodeDto(pubkey.toString(), c.remoteAlias(), c.channelId().getShortChannelId() % 2 != 0)) + .filter(channel -> channel.remotePubkey().equals(pubkey)) + .map(channel -> new NodeDto(pubkey.toString(), channel.remoteAlias(), isOnline(channel))) .findFirst().orElseThrow(); } @@ -108,7 +135,8 @@ public class DemoApplication { } private static NodeDetailsDto createNodeDetails(NodeDto node) { - OnlineReport onlineReport = node.online() ? OnlineReportFixtures.ONLINE_REPORT : OnlineReportFixtures.ONLINE_REPORT_OFFLINE; + OnlineReport onlineReport = node.online() + ? OnlineReportFixtures.ONLINE_REPORT : OnlineReportFixtures.ONLINE_REPORT_OFFLINE; return new NodeDetailsDto( Pubkey.create(node.pubkey()), node.alias(), @@ -126,4 +154,8 @@ public class DemoApplication { } } + + private static boolean isOnline(OpenChannelDto c) { + return c.channelId().getShortChannelId() % 2 != 0; + } } \ No newline at end of file diff --git a/web/src/test/java/de/cotto/lndmanagej/ui/dto/OpenChannelDtoTest.java b/web/src/test/java/de/cotto/lndmanagej/ui/dto/OpenChannelDtoTest.java index 48e5472d..8ed90d6f 100644 --- a/web/src/test/java/de/cotto/lndmanagej/ui/dto/OpenChannelDtoTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/ui/dto/OpenChannelDtoTest.java @@ -3,7 +3,7 @@ package de.cotto.lndmanagej.ui.dto; import org.junit.jupiter.api.Test; import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.ACINQ; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; class OpenChannelDtoTest { diff --git a/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/ChanDetailsDtoFixture.java b/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/ChanDetailsDtoFixture.java index ce86eadc..10bc79ef 100644 --- a/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/ChanDetailsDtoFixture.java +++ b/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/ChanDetailsDtoFixture.java @@ -1,7 +1,17 @@ package de.cotto.lndmanagej.ui.model; -import de.cotto.lndmanagej.controller.dto.*; -import de.cotto.lndmanagej.model.*; +import de.cotto.lndmanagej.controller.dto.BalanceInformationDto; +import de.cotto.lndmanagej.controller.dto.FeeReportDto; +import de.cotto.lndmanagej.controller.dto.FlowReportDto; +import de.cotto.lndmanagej.controller.dto.OnChainCostsDto; +import de.cotto.lndmanagej.controller.dto.PoliciesDto; +import de.cotto.lndmanagej.controller.dto.RebalanceReportDto; +import de.cotto.lndmanagej.model.ChannelIdFixtures; +import de.cotto.lndmanagej.model.FeeReportFixtures; +import de.cotto.lndmanagej.model.FlowReportFixtures; +import de.cotto.lndmanagej.model.OpenInitiator; +import de.cotto.lndmanagej.model.PubkeyFixtures; +import de.cotto.lndmanagej.model.RebalanceReportFixtures; import de.cotto.lndmanagej.model.warnings.ChannelWarningsFixtures; import de.cotto.lndmanagej.ui.dto.ChanDetailsDto; diff --git a/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/NodeDetailsDtoFixture.java b/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/NodeDetailsDtoFixture.java index 77cf7350..6efe91bb 100644 --- a/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/NodeDetailsDtoFixture.java +++ b/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/NodeDetailsDtoFixture.java @@ -1,7 +1,18 @@ package de.cotto.lndmanagej.ui.model; -import de.cotto.lndmanagej.controller.dto.*; -import de.cotto.lndmanagej.model.*; +import de.cotto.lndmanagej.controller.dto.BalanceInformationDto; +import de.cotto.lndmanagej.controller.dto.FeeReportDto; +import de.cotto.lndmanagej.controller.dto.FlowReportDto; +import de.cotto.lndmanagej.controller.dto.NodeDetailsDto; +import de.cotto.lndmanagej.controller.dto.OnChainCostsDto; +import de.cotto.lndmanagej.controller.dto.OnlineReportDto; +import de.cotto.lndmanagej.controller.dto.RebalanceReportDto; +import de.cotto.lndmanagej.model.ChannelIdFixtures; +import de.cotto.lndmanagej.model.FeeReportFixtures; +import de.cotto.lndmanagej.model.FlowReportFixtures; +import de.cotto.lndmanagej.model.OnlineReportFixtures; +import de.cotto.lndmanagej.model.PubkeyFixtures; +import de.cotto.lndmanagej.model.RebalanceReportFixtures; import de.cotto.lndmanagej.model.warnings.ChannelWarningsFixtures; import java.util.List; diff --git a/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/OpenChannelDtoFixture.java b/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/OpenChannelDtoFixture.java index acf5e2b5..c8727c96 100644 --- a/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/OpenChannelDtoFixture.java +++ b/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/OpenChannelDtoFixture.java @@ -2,7 +2,12 @@ package de.cotto.lndmanagej.ui.model; import de.cotto.lndmanagej.controller.dto.BalanceInformationDto; import de.cotto.lndmanagej.controller.dto.PoliciesDto; -import de.cotto.lndmanagej.model.*; +import de.cotto.lndmanagej.model.BalanceInformation; +import de.cotto.lndmanagej.model.ChannelId; +import de.cotto.lndmanagej.model.ChannelIdFixtures; +import de.cotto.lndmanagej.model.Coins; +import de.cotto.lndmanagej.model.Pubkey; +import de.cotto.lndmanagej.model.PubkeyFixtures; import de.cotto.lndmanagej.ui.dto.ChanDetailsDto; import de.cotto.lndmanagej.ui.dto.OpenChannelDto;