From 612d266af1a7ffe91e4a3dbdd47b225c79ff15e6 Mon Sep 17 00:00:00 2001 From: Carsten Otto Date: Tue, 10 May 2022 21:48:28 +0200 Subject: [PATCH] move ui demo to separate model --- settings.gradle | 1 + ui-demo/build.gradle | 14 ++++++++ .../ui/demo/ChannelIdResolverImpl.java | 20 +++++++++++ .../lndmanagej/ui/demo}/DemoApplication.java | 9 +++-- .../lndmanagej/ui}/demo/DemoDataService.java | 26 +++++++------- .../ui}/demo/utils/ChannelDetailsUtil.java | 5 +-- .../ui}/demo/utils/NodeDetailsUtil.java | 6 +--- .../ui}/demo/utils/NodeWarningsUtil.java | 5 +-- .../main}/resources/application.properties | 0 .../ui/ChannelDetailsControllerIT.java | 2 +- .../lndmanagej/ui/DashboardControllerIT.java | 2 +- .../ui/NodeDetailsControllerIT.java | 2 +- .../lndmanagej/ui/SearchControllerIT.java | 8 ++--- .../lndmanagej/UiDataServiceImplTest.java | 2 +- .../lndmanagej/ui/dto/OpenChannelDtoTest.java | 15 -------- .../dto/ChannelDetailsDtoFixture.java | 30 ++++++++++++++++ .../dto}/NodeDetailsDtoFixture.java | 15 ++++---- .../dto}/OpenChannelDtoFixture.java | 26 ++++++++------ .../ui/model/ChannelDetailsDtoFixture.java | 36 ------------------- 19 files changed, 119 insertions(+), 105 deletions(-) create mode 100644 ui-demo/build.gradle create mode 100644 ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/ChannelIdResolverImpl.java rename {web/src/test/java/de/cotto/lndmanagej => ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo}/DemoApplication.java (81%) rename {web/src/test/java/de/cotto/lndmanagej => ui-demo/src/main/java/de/cotto/lndmanagej/ui}/demo/DemoDataService.java (63%) rename {web/src/test/java/de/cotto/lndmanagej => ui-demo/src/main/java/de/cotto/lndmanagej/ui}/demo/utils/ChannelDetailsUtil.java (88%) rename {web/src/test/java/de/cotto/lndmanagej => ui-demo/src/main/java/de/cotto/lndmanagej/ui}/demo/utils/NodeDetailsUtil.java (89%) rename {web/src/test/java/de/cotto/lndmanagej => ui-demo/src/main/java/de/cotto/lndmanagej/ui}/demo/utils/NodeWarningsUtil.java (88%) rename {web/src/test => ui-demo/src/main}/resources/application.properties (100%) delete mode 100644 web/src/test/java/de/cotto/lndmanagej/ui/dto/OpenChannelDtoTest.java create mode 100644 web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDtoFixture.java rename web/src/testFixtures/java/de/cotto/lndmanagej/{ui/model => controller/dto}/NodeDetailsDtoFixture.java (83%) rename web/src/testFixtures/java/de/cotto/lndmanagej/{ui/model => controller/dto}/OpenChannelDtoFixture.java (85%) delete mode 100644 web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/ChannelDetailsDtoFixture.java diff --git a/settings.gradle b/settings.gradle index 1bed5675..6ab02ca5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,6 +14,7 @@ include 'selfpayments' include 'statistics' include 'transactions' include 'web' +include 'ui-demo' include 'grpc-adapter' include 'grpc-client' include 'application' diff --git a/ui-demo/build.gradle b/ui-demo/build.gradle new file mode 100644 index 00000000..b915051b --- /dev/null +++ b/ui-demo/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'lnd-manageJ.java-library-conventions' +} + +dependencies { + implementation project(':web') + implementation project(':model') + implementation testFixtures(project(':model')) + implementation testFixtures(project(':web')) +} + +pitest { + testStrengthThreshold = 0 +} diff --git a/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/ChannelIdResolverImpl.java b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/ChannelIdResolverImpl.java new file mode 100644 index 00000000..43058f4f --- /dev/null +++ b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/ChannelIdResolverImpl.java @@ -0,0 +1,20 @@ +package de.cotto.lndmanagej.ui.demo; + +import de.cotto.lndmanagej.model.ChannelId; +import de.cotto.lndmanagej.model.ChannelIdResolver; +import de.cotto.lndmanagej.model.ChannelPoint; +import org.springframework.stereotype.Component; + +import java.util.Optional; + +@Component +public class ChannelIdResolverImpl implements ChannelIdResolver { + public ChannelIdResolverImpl() { + // default constructor + } + + @Override + public Optional resolveFromChannelPoint(ChannelPoint channelPoint) { + return Optional.empty(); + } +} diff --git a/web/src/test/java/de/cotto/lndmanagej/DemoApplication.java b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/DemoApplication.java similarity index 81% rename from web/src/test/java/de/cotto/lndmanagej/DemoApplication.java rename to ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/DemoApplication.java index 0cf83f04..6e862cba 100644 --- a/web/src/test/java/de/cotto/lndmanagej/DemoApplication.java +++ b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/DemoApplication.java @@ -1,6 +1,7 @@ -package de.cotto.lndmanagej; +package de.cotto.lndmanagej.ui.demo; -import de.cotto.lndmanagej.demo.DemoDataService; +import de.cotto.lndmanagej.controller.ChannelIdConverter; +import de.cotto.lndmanagej.controller.PubkeyConverter; import de.cotto.lndmanagej.ui.UiDataService; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -10,6 +11,7 @@ import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfigurat import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; @Configuration @EnableAutoConfiguration( @@ -20,6 +22,7 @@ import org.springframework.context.annotation.Configuration; } ) @ComponentScan(basePackages = {"de.cotto.lndmanagej.ui"}) +@Import({ChannelIdConverter.class, PubkeyConverter.class}) public class DemoApplication { public DemoApplication() { @@ -34,4 +37,4 @@ public class DemoApplication { public static void main(String[] arguments) { SpringApplication.run(DemoApplication.class, arguments); } -} \ No newline at end of file +} diff --git a/web/src/test/java/de/cotto/lndmanagej/demo/DemoDataService.java b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/DemoDataService.java similarity index 63% rename from web/src/test/java/de/cotto/lndmanagej/demo/DemoDataService.java rename to ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/DemoDataService.java index 0deb2d55..eb22c0ad 100644 --- a/web/src/test/java/de/cotto/lndmanagej/demo/DemoDataService.java +++ b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/DemoDataService.java @@ -1,4 +1,4 @@ -package de.cotto.lndmanagej.demo; +package de.cotto.lndmanagej.ui.demo; import de.cotto.lndmanagej.controller.dto.NodeDetailsDto; import de.cotto.lndmanagej.model.ChannelId; @@ -11,16 +11,16 @@ import de.cotto.lndmanagej.ui.dto.StatusModel; import java.util.List; -import static de.cotto.lndmanagej.demo.utils.ChannelDetailsUtil.createChannelDetails; -import static de.cotto.lndmanagej.demo.utils.NodeDetailsUtil.createNodeDetails; -import static de.cotto.lndmanagej.demo.utils.NodeWarningsUtil.getStatusModel; -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; +import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.ACINQ; +import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.ACINQ2; +import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.BCASH; +import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.C_OTTO; +import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.OPEN_CHANNEL_DTO; +import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.WOS; +import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.WOS2; +import static de.cotto.lndmanagej.ui.demo.utils.ChannelDetailsUtil.createChannelDetails; +import static de.cotto.lndmanagej.ui.demo.utils.NodeDetailsUtil.createNodeDetails; +import static de.cotto.lndmanagej.ui.demo.utils.NodeWarningsUtil.getStatusModel; public class DemoDataService extends UiDataService { @@ -35,13 +35,13 @@ public class DemoDataService extends UiDataService { @Override public List getOpenChannels() { - return List.of(OPEN_CHANNEL_DTO, ACINQ, ACINQ2, WOS, WOS2, BCASH, COTTO); + return List.of(OPEN_CHANNEL_DTO, ACINQ, ACINQ2, WOS, WOS2, BCASH, C_OTTO); } @Override public ChannelDetailsDto getChannelDetails(ChannelId channelId) { OpenChannelDto localOpenChannel = getOpenChannels().stream() - .filter(c -> c.channelId().equals(channelId)) + .filter(c -> channelId.equals(c.channelId())) .findFirst() .orElseThrow(); return createChannelDetails(localOpenChannel); diff --git a/web/src/test/java/de/cotto/lndmanagej/demo/utils/ChannelDetailsUtil.java b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/utils/ChannelDetailsUtil.java similarity index 88% rename from web/src/test/java/de/cotto/lndmanagej/demo/utils/ChannelDetailsUtil.java rename to ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/utils/ChannelDetailsUtil.java index 19dab196..2c6cf9dc 100644 --- a/web/src/test/java/de/cotto/lndmanagej/demo/utils/ChannelDetailsUtil.java +++ b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/utils/ChannelDetailsUtil.java @@ -1,13 +1,10 @@ -package de.cotto.lndmanagej.demo.utils; +package de.cotto.lndmanagej.ui.demo.utils; 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.RebalanceReportDto; -import de.cotto.lndmanagej.model.FeeReportFixtures; -import de.cotto.lndmanagej.model.FlowReportFixtures; import de.cotto.lndmanagej.model.OpenInitiator; -import de.cotto.lndmanagej.model.RebalanceReportFixtures; import de.cotto.lndmanagej.ui.dto.ChannelDetailsDto; import de.cotto.lndmanagej.ui.dto.OpenChannelDto; diff --git a/web/src/test/java/de/cotto/lndmanagej/demo/utils/NodeDetailsUtil.java b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/utils/NodeDetailsUtil.java similarity index 89% rename from web/src/test/java/de/cotto/lndmanagej/demo/utils/NodeDetailsUtil.java rename to ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/utils/NodeDetailsUtil.java index 77a8d722..7748c858 100644 --- a/web/src/test/java/de/cotto/lndmanagej/demo/utils/NodeDetailsUtil.java +++ b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/utils/NodeDetailsUtil.java @@ -1,4 +1,4 @@ -package de.cotto.lndmanagej.demo.utils; +package de.cotto.lndmanagej.ui.demo.utils; import de.cotto.lndmanagej.controller.dto.BalanceInformationDto; import de.cotto.lndmanagej.controller.dto.FeeReportDto; @@ -8,12 +8,8 @@ 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.FeeReportFixtures; -import de.cotto.lndmanagej.model.FlowReportFixtures; import de.cotto.lndmanagej.model.OnlineReport; -import de.cotto.lndmanagej.model.OnlineReportFixtures; import de.cotto.lndmanagej.model.Pubkey; -import de.cotto.lndmanagej.model.RebalanceReportFixtures; import de.cotto.lndmanagej.ui.dto.NodeDto; import java.util.List; diff --git a/web/src/test/java/de/cotto/lndmanagej/demo/utils/NodeWarningsUtil.java b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/utils/NodeWarningsUtil.java similarity index 88% rename from web/src/test/java/de/cotto/lndmanagej/demo/utils/NodeWarningsUtil.java rename to ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/utils/NodeWarningsUtil.java index 3c1320b9..d2112deb 100644 --- a/web/src/test/java/de/cotto/lndmanagej/demo/utils/NodeWarningsUtil.java +++ b/ui-demo/src/main/java/de/cotto/lndmanagej/ui/demo/utils/NodeWarningsUtil.java @@ -1,11 +1,8 @@ -package de.cotto.lndmanagej.demo.utils; +package de.cotto.lndmanagej.ui.demo.utils; import de.cotto.lndmanagej.controller.dto.ChannelWithWarningsDto; import de.cotto.lndmanagej.controller.dto.NodeWithWarningsDto; import de.cotto.lndmanagej.controller.dto.NodesAndChannelsWithWarningsDto; -import de.cotto.lndmanagej.model.PubkeyFixtures; -import de.cotto.lndmanagej.model.warnings.ChannelWarningsFixtures; -import de.cotto.lndmanagej.model.warnings.NodeWarningsFixtures; import de.cotto.lndmanagej.model.warnings.Warning; import de.cotto.lndmanagej.ui.dto.StatusModel; diff --git a/web/src/test/resources/application.properties b/ui-demo/src/main/resources/application.properties similarity index 100% rename from web/src/test/resources/application.properties rename to ui-demo/src/main/resources/application.properties diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChannelDetailsControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChannelDetailsControllerIT.java index a9627972..abadd48f 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChannelDetailsControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChannelDetailsControllerIT.java @@ -10,8 +10,8 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.web.servlet.MockMvc; +import static de.cotto.lndmanagej.controller.dto.ChannelDetailsDtoFixture.CHANNEL_DETAILS_DTO; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; -import static de.cotto.lndmanagej.ui.model.ChannelDetailsDtoFixture.CHANNEL_DETAILS_DTO; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerIT.java index 6ad1c702..2bfd0f16 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/DashboardControllerIT.java @@ -16,7 +16,7 @@ import org.springframework.test.web.servlet.MockMvc; import java.util.List; import static de.cotto.lndmanagej.controller.dto.NodesAndChannelsWithWarningsDto.NONE; -import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.OPEN_CHANNEL_DTO; +import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.OPEN_CHANNEL_DTO; 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.status; diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/NodeDetailsControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/NodeDetailsControllerIT.java index a94e9d00..e3f96971 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/NodeDetailsControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/NodeDetailsControllerIT.java @@ -10,7 +10,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.web.servlet.MockMvc; -import static de.cotto.lndmanagej.ui.model.NodeDetailsDtoFixture.NODE_DETAILS_DTO; +import static de.cotto.lndmanagej.controller.dto.NodeDetailsDtoFixture.NODE_DETAILS_DTO; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerIT.java index ce169f61..0565f684 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerIT.java @@ -21,12 +21,12 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; +import static de.cotto.lndmanagej.controller.dto.ChannelDetailsDtoFixture.CHANNEL_DETAILS_DTO; +import static de.cotto.lndmanagej.controller.dto.NodeDetailsDtoFixture.NODE_DETAILS_DTO; +import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.OPEN_CHANNEL_DTO; +import static de.cotto.lndmanagej.controller.dto.OpenChannelDtoFixture.WOS; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; import static de.cotto.lndmanagej.model.ChannelPointFixtures.CHANNEL_POINT; -import static de.cotto.lndmanagej.ui.model.ChannelDetailsDtoFixture.CHANNEL_DETAILS_DTO; -import static de.cotto.lndmanagej.ui.model.NodeDetailsDtoFixture.NODE_DETAILS_DTO; -import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.OPEN_CHANNEL_DTO; -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.when; diff --git a/web/src/test/java/de/cotto/lndmanagej/UiDataServiceImplTest.java b/web/src/test/java/de/cotto/lndmanagej/UiDataServiceImplTest.java index dd545467..c5f8dbbe 100644 --- a/web/src/test/java/de/cotto/lndmanagej/UiDataServiceImplTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/UiDataServiceImplTest.java @@ -29,6 +29,7 @@ import java.util.List; import java.util.Optional; import java.util.Set; +import static de.cotto.lndmanagej.controller.dto.NodeDetailsDtoFixture.NODE_DETAILS_DTO; import static de.cotto.lndmanagej.model.BalanceInformationFixtures.BALANCE_INFORMATION; import static de.cotto.lndmanagej.model.ChannelDetailsFixtures.CHANNEL_DETAILS; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; @@ -44,7 +45,6 @@ import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY; import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_2; import static de.cotto.lndmanagej.model.RebalanceReportFixtures.REBALANCE_REPORT; import static de.cotto.lndmanagej.model.warnings.ChannelWarningFixtures.CHANNEL_NUM_UPDATES_WARNING; -import static de.cotto.lndmanagej.ui.model.NodeDetailsDtoFixture.NODE_DETAILS_DTO; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.mockito.Mockito.when; 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 deleted file mode 100644 index 3e8a50be..00000000 --- a/web/src/test/java/de/cotto/lndmanagej/ui/dto/OpenChannelDtoTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.cotto.lndmanagej.ui.dto; - -import org.junit.jupiter.api.Test; - -import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.ACINQ; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.data.Percentage.withPercentage; - -class OpenChannelDtoTest { - - @Test - void getLocalBalancePercentForPerfectlyBalancedChannel() { - assertThat(ACINQ.getOutboundPercentage()).isCloseTo(50, withPercentage(1)); - } -} diff --git a/web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDtoFixture.java b/web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDtoFixture.java new file mode 100644 index 00000000..7c0e4ebc --- /dev/null +++ b/web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDtoFixture.java @@ -0,0 +1,30 @@ +package de.cotto.lndmanagej.controller.dto; + +import de.cotto.lndmanagej.ui.dto.ChannelDetailsDto; + +import static de.cotto.lndmanagej.model.BalanceInformationFixtures.BALANCE_INFORMATION; +import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; +import static de.cotto.lndmanagej.model.FeeReportFixtures.FEE_REPORT; +import static de.cotto.lndmanagej.model.FlowReportFixtures.FLOW_REPORT; +import static de.cotto.lndmanagej.model.OnChainCostsFixtures.ON_CHAIN_COSTS; +import static de.cotto.lndmanagej.model.OpenInitiator.LOCAL; +import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES_FOR_LOCAL_CHANNEL; +import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY; +import static de.cotto.lndmanagej.model.RebalanceReportFixtures.REBALANCE_REPORT; +import static de.cotto.lndmanagej.model.warnings.ChannelWarningsFixtures.CHANNEL_WARNINGS; + +public class ChannelDetailsDtoFixture { + + public static final ChannelDetailsDto CHANNEL_DETAILS_DTO = new ChannelDetailsDto( + CHANNEL_ID, + PUBKEY, + "Albert", + LOCAL, + BalanceInformationDto.createFromModel(BALANCE_INFORMATION), + OnChainCostsDto.createFromModel(ON_CHAIN_COSTS), + PoliciesDto.createFromModel(POLICIES_FOR_LOCAL_CHANNEL), + FeeReportDto.createFromModel(FEE_REPORT), + FlowReportDto.createFromModel(FLOW_REPORT), + RebalanceReportDto.createFromModel(REBALANCE_REPORT), + CHANNEL_WARNINGS.descriptions()); +} diff --git a/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/NodeDetailsDtoFixture.java b/web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDtoFixture.java similarity index 83% rename from web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/NodeDetailsDtoFixture.java rename to web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDtoFixture.java index 7da788f9..a3eab568 100644 --- a/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/NodeDetailsDtoFixture.java +++ b/web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDtoFixture.java @@ -1,4 +1,4 @@ -package de.cotto.lndmanagej.ui.model; +package de.cotto.lndmanagej.controller.dto; import de.cotto.lndmanagej.controller.dto.BalanceInformationDto; import de.cotto.lndmanagej.controller.dto.FeeReportDto; @@ -7,9 +7,11 @@ 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.BalanceInformationFixtures; import de.cotto.lndmanagej.model.ChannelIdFixtures; import de.cotto.lndmanagej.model.FeeReportFixtures; import de.cotto.lndmanagej.model.FlowReportFixtures; +import de.cotto.lndmanagej.model.OnChainCostsFixtures; import de.cotto.lndmanagej.model.OnlineReportFixtures; import de.cotto.lndmanagej.model.PubkeyFixtures; import de.cotto.lndmanagej.model.RebalanceReportFixtures; @@ -18,6 +20,7 @@ import de.cotto.lndmanagej.model.warnings.ChannelWarningsFixtures; import java.util.List; import static de.cotto.lndmanagej.model.BalanceInformationFixtures.BALANCE_INFORMATION; +import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; import static de.cotto.lndmanagej.model.FeeReportFixtures.FEE_REPORT; import static de.cotto.lndmanagej.model.FlowReportFixtures.FLOW_REPORT; import static de.cotto.lndmanagej.model.OnChainCostsFixtures.ON_CHAIN_COSTS; @@ -29,12 +32,12 @@ import static de.cotto.lndmanagej.model.warnings.ChannelWarningsFixtures.CHANNEL public class NodeDetailsDtoFixture { public static final NodeDetailsDto NODE_DETAILS_DTO = new NodeDetailsDto( - PUBKEY, + PubkeyFixtures.PUBKEY, "Albert", - List.of(ChannelIdFixtures.CHANNEL_ID), - List.of(ChannelIdFixtures.CHANNEL_ID), - List.of(ChannelIdFixtures.CHANNEL_ID), - List.of(ChannelIdFixtures.CHANNEL_ID), + List.of(CHANNEL_ID), + List.of(CHANNEL_ID), + List.of(CHANNEL_ID), + List.of(CHANNEL_ID), OnChainCostsDto.createFromModel(ON_CHAIN_COSTS), BalanceInformationDto.createFromModel(BALANCE_INFORMATION), OnlineReportDto.createFromModel(ONLINE_REPORT), diff --git a/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/OpenChannelDtoFixture.java b/web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/OpenChannelDtoFixture.java similarity index 85% rename from web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/OpenChannelDtoFixture.java rename to web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/OpenChannelDtoFixture.java index 9593dfc2..5a667792 100644 --- a/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/OpenChannelDtoFixture.java +++ b/web/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/OpenChannelDtoFixture.java @@ -1,31 +1,35 @@ -package de.cotto.lndmanagej.ui.model; +package de.cotto.lndmanagej.controller.dto; import de.cotto.lndmanagej.controller.dto.BalanceInformationDto; import de.cotto.lndmanagej.controller.dto.PoliciesDto; 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.OpenChannelDto; import static de.cotto.lndmanagej.model.BalanceInformationFixtures.BALANCE_INFORMATION; +import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; +import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_2; +import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_3; +import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_4; +import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_5; import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES_FOR_LOCAL_CHANNEL; +import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY; public class OpenChannelDtoFixture { public static final long MILLION = 1_000_000; public static final OpenChannelDto OPEN_CHANNEL_DTO = new OpenChannelDto( - ChannelIdFixtures.CHANNEL_ID, + CHANNEL_ID, "Albert", - PubkeyFixtures.PUBKEY, + PUBKEY, PoliciesDto.createFromModel(POLICIES_FOR_LOCAL_CHANNEL), BalanceInformationDto.createFromModel(BALANCE_INFORMATION)); public static final OpenChannelDto ACINQ = new OpenChannelDto( - ChannelIdFixtures.CHANNEL_ID_2, + CHANNEL_ID_2, "ACINQ", Pubkey.create("03864ef025fde8fb587d989186ce6a4a186895ee44a926bfc370e2c366597a3f8f"), PoliciesDto.createFromModel(POLICIES_FOR_LOCAL_CHANNEL), @@ -49,7 +53,7 @@ public class OpenChannelDtoFixture { ))); public static final OpenChannelDto WOS = new OpenChannelDto( - ChannelIdFixtures.CHANNEL_ID_3, + CHANNEL_ID_3, "WalletOfSatoshi.com", Pubkey.create("035e4ff418fc8b5554c5d9eea66396c227bd429a3251c8cbc711002ba215bfc226"), PoliciesDto.createFromModel(POLICIES_FOR_LOCAL_CHANNEL), @@ -61,7 +65,7 @@ public class OpenChannelDtoFixture { ))); public static final OpenChannelDto WOS2 = new OpenChannelDto( - ChannelIdFixtures.CHANNEL_ID_3, + CHANNEL_ID_3, "WalletOfSatoshi.com", Pubkey.create("035e4ff418fc8b5554c5d9eea66396c227bd429a3251c8cbc711002ba215bfc226"), PoliciesDto.createFromModel(POLICIES_FOR_LOCAL_CHANNEL), @@ -73,7 +77,7 @@ public class OpenChannelDtoFixture { ))); public static final OpenChannelDto BCASH = new OpenChannelDto( - ChannelIdFixtures.CHANNEL_ID_4, + CHANNEL_ID_4, "BCash_Is_Trash", Pubkey.create("0298f6074a454a1f5345cb2a7c6f9fce206cd0bf675d177cdbf0ca7508dd28852f"), PoliciesDto.createFromModel(POLICIES_FOR_LOCAL_CHANNEL), @@ -84,8 +88,8 @@ public class OpenChannelDtoFixture { Coins.ofSatoshis(500) ))); - public static final OpenChannelDto COTTO = new OpenChannelDto( - ChannelIdFixtures.CHANNEL_ID_5, + public static final OpenChannelDto C_OTTO = new OpenChannelDto( + CHANNEL_ID_5, "c-otto.de", Pubkey.create("027ce055380348d7812d2ae7745701c9f93e70c1adeb2657f053f91df4f2843c71"), PoliciesDto.createFromModel(POLICIES_FOR_LOCAL_CHANNEL), diff --git a/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/ChannelDetailsDtoFixture.java b/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/ChannelDetailsDtoFixture.java deleted file mode 100644 index ed283377..00000000 --- a/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/ChannelDetailsDtoFixture.java +++ /dev/null @@ -1,36 +0,0 @@ -package de.cotto.lndmanagej.ui.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.FeeReportFixtures; -import de.cotto.lndmanagej.model.FlowReportFixtures; -import de.cotto.lndmanagej.model.OpenInitiator; -import de.cotto.lndmanagej.model.RebalanceReportFixtures; -import de.cotto.lndmanagej.model.warnings.ChannelWarningsFixtures; -import de.cotto.lndmanagej.ui.dto.ChannelDetailsDto; - -import static de.cotto.lndmanagej.model.BalanceInformationFixtures.BALANCE_INFORMATION; -import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; -import static de.cotto.lndmanagej.model.OnChainCostsFixtures.ON_CHAIN_COSTS; -import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES_FOR_LOCAL_CHANNEL; -import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY; - -public class ChannelDetailsDtoFixture { - - public static final ChannelDetailsDto CHANNEL_DETAILS_DTO = new ChannelDetailsDto( - CHANNEL_ID, - PUBKEY, - "Albert", - OpenInitiator.LOCAL, - BalanceInformationDto.createFromModel(BALANCE_INFORMATION), - OnChainCostsDto.createFromModel(ON_CHAIN_COSTS), - PoliciesDto.createFromModel(POLICIES_FOR_LOCAL_CHANNEL), - FeeReportDto.createFromModel(FeeReportFixtures.FEE_REPORT), - FlowReportDto.createFromModel(FlowReportFixtures.FLOW_REPORT), - RebalanceReportDto.createFromModel(RebalanceReportFixtures.REBALANCE_REPORT), - ChannelWarningsFixtures.CHANNEL_WARNINGS.descriptions()); -}