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

return num updates as part of channel information

Browse Source
This commit is contained in:
Carsten Otto
2022-02-26 17:59:20 +01:00
parent 88bbaa8c22
commit 8a55785cea
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
model/src/testFixtures/java/de/cotto/lndmanagej/model/LocalOpenChannelFixtures.java
View File

@@ -17,7 +17,7 @@ import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_2;
import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_3;
public class LocalOpenChannelFixtures {
public static final long NUM_UPDATES = 99_999L;
public static final long NUM_UPDATES = 100_200_300_400L;
public static final Coins TOTAL_SENT = Coins.ofSatoshis(1_001);
public static final Coins TOTAL_SENT_2 = Coins.ofSatoshis(101);

5
web/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelControllerIT.java
View File

@@ -30,6 +30,7 @@ import static de.cotto.lndmanagej.model.ForceClosedChannelFixtures.FORCE_CLOSED_
import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL;
import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_2;
import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_PRIVATE;
import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.NUM_UPDATES;
import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.TOTAL_RECEIVED;
import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.TOTAL_RECEIVED_2;
import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.TOTAL_SENT;
@@ -99,7 +100,8 @@ class ChannelControllerIT {
.andExpect(jsonPath("$.status.private", is(false)))
.andExpect(jsonPath("$.status.active", is(false)))
.andExpect(jsonPath("$.status.closed", is(false)))
.andExpect(jsonPath("$.status.openClosed", is("OPEN")));
.andExpect(jsonPath("$.status.openClosed", is("OPEN")))
.andExpect(jsonPath("$.numUpdates", is(NUM_UPDATES)));
}
@Test
@@ -140,6 +142,7 @@ class ChannelControllerIT {
.andExpect(jsonPath("$.status.active", is(true)))
.andExpect(jsonPath("$.status.closed", is(false)))
.andExpect(jsonPath("$.status.openClosed", is("OPEN")))
.andExpect(jsonPath("$.numUpdates", is(NUM_UPDATES)))
.andExpect(jsonPath("$.onChainCosts.openCosts", is("1000")))
.andExpect(jsonPath("$.onChainCosts.closeCosts", is("2000")))
.andExpect(jsonPath("$.onChainCosts.sweepCosts", is("3000")))

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

@@ -31,7 +31,8 @@ public record ChannelDetailsDto(
ClosedChannelDetailsDto closeDetails,
FeeReportDto feeReport,
FlowReportDto flowReport,
RebalanceReportDto rebalanceReport
RebalanceReportDto rebalanceReport,
long numUpdates
) {
public ChannelDetailsDto(
ChannelDto channelDto,
@@ -62,7 +63,8 @@ public record ChannelDetailsDto(
channelDto.closeDetails(),
FeeReportDto.createFromModel(feeReport),
FlowReportDto.createFromModel(flowReport),
RebalanceReportDto.createFromModel(rebalanceReport)
RebalanceReportDto.createFromModel(rebalanceReport),
channelDto.numUpdates()
);
}

7
web/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDto.java
View File

@@ -2,6 +2,7 @@ package de.cotto.lndmanagej.controller.dto;
import de.cotto.lndmanagej.model.ChannelPoint;
import de.cotto.lndmanagej.model.LocalChannel;
import de.cotto.lndmanagej.model.LocalOpenChannel;
import de.cotto.lndmanagej.model.OpenInitiator;
import de.cotto.lndmanagej.model.Pubkey;
@@ -17,7 +18,8 @@ public record ChannelDto(
String totalReceived,
ChannelStatusDto status,
OpenInitiator openInitiator,
ClosedChannelDetailsDto closeDetails
ClosedChannelDetailsDto closeDetails,
long numUpdates
) {
public ChannelDto(LocalChannel localChannel) {
this(
@@ -32,7 +34,8 @@ public record ChannelDto(
String.valueOf(localChannel.getTotalReceived().satoshis()),
ChannelStatusDto.createFromModel(localChannel.getStatus()),
localChannel.getOpenInitiator(),
ClosedChannelDetailsDto.createFromModel(localChannel)
ClosedChannelDetailsDto.createFromModel(localChannel),
localChannel instanceof LocalOpenChannel localOpenChannel ? localOpenChannel.getNumUpdates() : 0L
);
}
}