aljaz/lnd-manageJ
1
0
Fork 0
mirror of https://github.com/aljazceru/lnd-manageJ.git synced 2026-01-22 23:44:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

add "is closed" to channel details

Browse Source
This commit is contained in:
Carsten Otto
2021-11-23 23:03:51 +01:00
parent 6d3b463e70
commit 29aef8d083
12 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
model/src/main/java/de/cotto/lndmanagej/model/ClosedChannel.java
View File

@@ -31,6 +31,11 @@ public abstract class ClosedChannel extends ClosedOrClosingChannel {
return closeInitiator;
}
@Override
public boolean isClosed() {
return true;
}
@Override
@SuppressWarnings("CPD-START")
public boolean equals(Object other) {

5
model/src/main/java/de/cotto/lndmanagej/model/ForceClosingChannel.java
View File

@@ -24,6 +24,11 @@ public final class ForceClosingChannel extends ClosedOrClosingChannel {
return htlcOutpoints;
}
@Override
public boolean isClosed() {
return true;
}
@Override
@SuppressWarnings("CPD-START")
public boolean equals(Object other) {

4
model/src/main/java/de/cotto/lndmanagej/model/LocalChannel.java
View File

@@ -38,6 +38,10 @@ public class LocalChannel extends Channel {
return false;
}
public boolean isClosed() {
return false;
}
@Override
@SuppressWarnings("CPD-START")
public boolean equals(Object other) {

5
model/src/test/java/de/cotto/lndmanagej/model/BreachForceClosedChannelTest.java
View File

@@ -67,6 +67,11 @@ class BreachForceClosedChannelTest {
assertThat(FORCE_CLOSED_CHANNEL_BREACH.getCloseInitiator()).isEqualTo(CloseInitiator.REMOTE);
}
@Test
void isClosed() {
assertThat(FORCE_CLOSED_CHANNEL_BREACH.isClosed()).isTrue();
}
@Test
void testEquals() {
EqualsVerifier.forClass(BreachForceClosedChannel.class).usingGetClass().verify();

5
model/src/test/java/de/cotto/lndmanagej/model/CoopClosedChannelTest.java
View File

@@ -70,6 +70,11 @@ class CoopClosedChannelTest {
assertThat(CLOSED_CHANNEL.getCloseInitiator()).isEqualTo(CloseInitiator.REMOTE);
}
@Test
void isClosed() {
assertThat(CLOSED_CHANNEL.isClosed()).isTrue();
}
@Test
void testEquals() {
EqualsVerifier.forClass(CoopClosedChannel.class).usingGetClass().verify();

5
model/src/test/java/de/cotto/lndmanagej/model/ForceClosedChannelTest.java
View File

@@ -69,6 +69,11 @@ class ForceClosedChannelTest {
assertThat(FORCE_CLOSED_CHANNEL_REMOTE.getCloseInitiator()).isEqualTo(CloseInitiator.REMOTE);
}
@Test
void isClosed() {
assertThat(FORCE_CLOSED_CHANNEL_REMOTE.isClosed()).isTrue();
}
@Test
void testEquals() {
EqualsVerifier.forClass(ForceClosedChannel.class).usingGetClass().verify();

5
model/src/test/java/de/cotto/lndmanagej/model/ForceClosingChannelTest.java
View File

@@ -59,6 +59,11 @@ class ForceClosingChannelTest {
assertThat(FORCE_CLOSING_CHANNEL.getHtlcOutpoints()).isEqualTo(HTLC_OUTPOINTS);
}
@Test
void isClosed() {
assertThat(FORCE_CLOSING_CHANNEL.isClosed()).isTrue();
}
@Test
void testEquals() {
EqualsVerifier.forClass(ForceClosingChannel.class).usingGetClass().verify();

5
model/src/test/java/de/cotto/lndmanagej/model/LocalOpenChannelTest.java
View File

@@ -71,6 +71,11 @@ class LocalOpenChannelTest {
assertThat(LOCAL_OPEN_CHANNEL.isPrivateChannel()).isFalse();
}
@Test
void isClosed() {
assertThat(LOCAL_OPEN_CHANNEL.isClosed()).isFalse();
}
@Test
void isPrivateChannel_true() {
assertThat(LOCAL_OPEN_CHANNEL_PRIVATE.isPrivateChannel()).isTrue();

5
model/src/test/java/de/cotto/lndmanagej/model/WaitingCloseChannelTest.java
View File

@@ -48,6 +48,11 @@ class WaitingCloseChannelTest {
assertThat(WAITING_CLOSE_CHANNEL.isActive()).isFalse();
}
@Test
void isClosed() {
assertThat(WAITING_CLOSE_CHANNEL.isClosed()).isFalse();
}
@Test
void testEquals() {
EqualsVerifier.forClass(WaitingCloseChannel.class).usingGetClass().verify();

1
web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerIT.java
View File

@@ -74,6 +74,7 @@ class ChannelDetailsControllerIT {
.andExpect(jsonPath("$.openHeight", is(CHANNEL_ID.getBlockHeight())))
.andExpect(jsonPath("$.private", is(true)))
.andExpect(jsonPath("$.active", is(true)))
.andExpect(jsonPath("$.closed", is(false)))
.andExpect(jsonPath("$.onChainCosts.openCosts", is("1000")))
.andExpect(jsonPath("$.onChainCosts.closeCosts", is("2000")))
.andExpect(jsonPath("$.balance.localBalance", is("2000")))

2
web/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDto.java
View File

@@ -17,6 +17,7 @@ public record ChannelDetailsDto(
String capacity,
@JsonProperty("private") boolean privateChannel,
boolean active,
boolean closed,
BalanceInformationDto balance,
OnChainCostsDto onChainCosts
) {
@@ -37,6 +38,7 @@ public record ChannelDetailsDto(
String.valueOf(localChannel.getCapacity().satoshis()),
localChannel.isPrivateChannel(),
localChannel.isActive(),
localChannel.isClosed(),
BalanceInformationDto.createFrom(balanceInformation),
onChainCosts
);

12
web/src/test/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDtoTest.java
View File

@@ -84,6 +84,18 @@ class ChannelDetailsDtoTest {
assertThat(CHANNEL_DETAILS_DTO.active()).isFalse();
}
@Test
void closed_true() {
assertThat(CHANNEL_DETAILS_DTO.closed()).isTrue();
}
@Test
void closed_false() {
ChannelDetailsDto dto =
new ChannelDetailsDto(LOCAL_OPEN_CHANNEL, ALIAS, BALANCE_INFORMATION, ON_CHAIN_COSTS);
assertThat(dto.closed()).isFalse();
}
@Test
void balance() {
assertThat(CHANNEL_DETAILS_DTO.balance()).isEqualTo(BalanceInformationDto.createFrom(BALANCE_INFORMATION));