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

default to compact form, add channel point to channel details

Browse Source
This commit is contained in:
Carsten Otto
2021-11-22 19:10:21 +01:00
parent 1d41b532c8
commit a82cb13ef7
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/src/integrationTest/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerIT.java
View File

@@ -16,6 +16,7 @@ import java.util.Optional;
import static de.cotto.lndmanagej.model.BalanceInformationFixtures.BALANCE_INFORMATION_2;
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;
import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS_2;
import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_2;
@@ -62,7 +63,10 @@ class ChannelDetailsControllerIT {
when(onChainCostService.getCloseCosts(CHANNEL_ID)).thenReturn(Optional.of(Coins.ofSatoshis(2000)));
when(balanceService.getBalanceInformation(CHANNEL_ID)).thenReturn(Optional.of(BALANCE_INFORMATION_2));
mockMvc.perform(get(CHANNEL_PREFIX + "/details"))
.andExpect(jsonPath("$.channelId", is(CHANNEL_ID.toString())))
.andExpect(jsonPath("$.channelIdShort", is(String.valueOf(CHANNEL_ID.getShortChannelId()))))
.andExpect(jsonPath("$.channelIdCompact", is(CHANNEL_ID.getCompactForm())))
.andExpect(jsonPath("$.channelIdCompactLnd", is(CHANNEL_ID.getCompactFormLnd())))
.andExpect(jsonPath("$.channelPoint", is(CHANNEL_POINT.toString())))
.andExpect(jsonPath("$.remotePubkey", is(PUBKEY_2.toString())))
.andExpect(jsonPath("$.remoteAlias", is(ALIAS_2)))
.andExpect(jsonPath("$.private", is(true)))

8
application/src/main/java/de/cotto/lndmanagej/controller/dto/ChannelDetailsDto.java
View File

@@ -2,14 +2,15 @@ package de.cotto.lndmanagej.controller.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import de.cotto.lndmanagej.model.BalanceInformation;
import de.cotto.lndmanagej.model.ChannelId;
import de.cotto.lndmanagej.model.ChannelPoint;
import de.cotto.lndmanagej.model.LocalChannel;
import de.cotto.lndmanagej.model.Pubkey;
public record ChannelDetailsDto(
ChannelId channelId,
String channelIdShort,
String channelIdCompact,
String channelIdCompactLnd,
ChannelPoint channelPoint,
Pubkey remotePubkey,
String remoteAlias,
@JsonProperty("private") boolean privateChannel,
@@ -23,9 +24,10 @@ public record ChannelDetailsDto(
OnChainCostsDto onChainCosts
) {
this(
localChannel.getId(),
String.valueOf(localChannel.getId().getShortChannelId()),
localChannel.getId().getCompactForm(),
localChannel.getId().getCompactFormLnd(),
localChannel.getChannelPoint(),
localChannel.getRemotePubkey(),
remoteAlias,
localChannel.isPrivateChannel(),

2
application/src/main/java/de/cotto/lndmanagej/controller/dto/ObjectMapperConfiguration.java
View File

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import de.cotto.lndmanagej.model.ChannelId;
import de.cotto.lndmanagej.model.ChannelPoint;
import de.cotto.lndmanagej.model.Pubkey;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -21,6 +22,7 @@ public class ObjectMapperConfiguration {
SimpleModule module = new SimpleModule("SimpleModule");
module.addSerializer(Pubkey.class, new ToStringSerializer());
module.addSerializer(ChannelId.class, new ToStringSerializer());
module.addSerializer(ChannelPoint.class, new ToStringSerializer());
return new ObjectMapper().registerModule(module);
}
}

2
model/src/main/java/de/cotto/lndmanagej/model/ChannelId.java
View File

@@ -64,7 +64,7 @@ public final class ChannelId implements Comparable<ChannelId> {
@Override
public String toString() {
return String.valueOf(shortChannelId);
return getCompactForm();
}
@Override

3
model/src/test/java/de/cotto/lndmanagej/model/ChannelIdTest.java
View File

@@ -144,7 +144,6 @@ class ChannelIdTest {
@Test
void testToString() {
String expectedString = String.valueOf(CHANNEL_ID.getShortChannelId());
assertThat(CHANNEL_ID).hasToString(expectedString);
assertThat(CHANNEL_ID).hasToString(CHANNEL_ID.getCompactForm());
}
}