diff --git a/web/build.gradle b/web/build.gradle index d20ae367..51e45f59 100644 --- a/web/build.gradle +++ b/web/build.gradle @@ -6,9 +6,6 @@ dependencies { implementation('org.springframework.boot:spring-boot-starter-web') implementation project(':backend') implementation project(':model') -// implementation project(':caching') implementation project(':metrics') -// implementation project(':transactions') testImplementation testFixtures(project(':model')) -// testImplementation testFixtures(project(':transactions')) } \ No newline at end of file diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerIT.java index 7aa56504..76f6d923 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerIT.java @@ -15,6 +15,7 @@ import org.springframework.test.web.servlet.MockMvc; import java.util.Optional; import static de.cotto.lndmanagej.model.BalanceInformationFixtures.BALANCE_INFORMATION_2; +import static de.cotto.lndmanagej.model.ChannelFixtures.CAPACITY; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; import static de.cotto.lndmanagej.model.ChannelPointFixtures.CHANNEL_POINT; import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_PRIVATE; @@ -69,6 +70,7 @@ class ChannelDetailsControllerIT { .andExpect(jsonPath("$.channelPoint", is(CHANNEL_POINT.toString()))) .andExpect(jsonPath("$.remotePubkey", is(PUBKEY_2.toString()))) .andExpect(jsonPath("$.remoteAlias", is(ALIAS_2))) + .andExpect(jsonPath("$.capacity", is(String.valueOf(CAPACITY.satoshis())))) .andExpect(jsonPath("$.private", is(true))) .andExpect(jsonPath("$.onChainCosts.openCosts", is("1000"))) .andExpect(jsonPath("$.onChainCosts.closeCosts", is("2000"))) diff --git a/web/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDto.java b/web/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDto.java index 7750353a..ecd2f1e5 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDto.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDto.java @@ -13,6 +13,7 @@ public record ChannelDetailsDto( ChannelPoint channelPoint, Pubkey remotePubkey, String remoteAlias, + String capacity, @JsonProperty("private") boolean privateChannel, BalanceInformationDto balance, OnChainCostsDto onChainCosts @@ -30,6 +31,7 @@ public record ChannelDetailsDto( localChannel.getChannelPoint(), localChannel.getRemotePubkey(), remoteAlias, + String.valueOf(localChannel.getCapacity().satoshis()), localChannel.isPrivateChannel(), BalanceInformationDto.createFrom(balanceInformation), onChainCosts