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

Merge branch 'main' into fix-5746

Browse Source
This commit is contained in:
Carsten Otto
2022-06-02 13:23:30 +02:00
parent e26919ca89 fac4ddcb60
commit 7e9e3dae22
3 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web/src/integrationTest/java/de/cotto/lndmanagej/controller/LegacyControllerIT.java
View File

@@ -3,6 +3,7 @@ package de.cotto.lndmanagej.controller;
import de.cotto.lndmanagej.model.ChannelIdResolver;
import de.cotto.lndmanagej.service.ChannelService;
import de.cotto.lndmanagej.service.NodeService;
import de.cotto.lndmanagej.service.PolicyService;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
@@ -30,6 +31,10 @@ class LegacyControllerIT {
@SuppressWarnings("unused")
private NodeService nodeService;
@MockBean
@SuppressWarnings("unused")
private PolicyService policyService;
@MockBean
private ChannelService channelService;
@@ -39,4 +44,4 @@ class LegacyControllerIT {
mockMvc.perform(get("/legacy/open-channels/pretty"))
.andExpect(status().isOk());
}
}
}

14
web/src/main/java/de/cotto/lndmanagej/controller/LegacyController.java
View File

@@ -2,9 +2,11 @@ package de.cotto.lndmanagej.controller;
import com.codahale.metrics.annotation.Timed;
import de.cotto.lndmanagej.model.LocalOpenChannel;
import de.cotto.lndmanagej.model.Policy;
import de.cotto.lndmanagej.model.Pubkey;
import de.cotto.lndmanagej.service.ChannelService;
import de.cotto.lndmanagej.service.NodeService;
import de.cotto.lndmanagej.service.PolicyService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -18,13 +20,16 @@ public class LegacyController {
private static final String NEWLINE = "\n";
private final NodeService nodeService;
private final ChannelService channelService;
private final PolicyService policyService;
public LegacyController(
NodeService nodeService,
ChannelService channelService
ChannelService channelService,
PolicyService policyService
) {
this.nodeService = nodeService;
this.channelService = channelService;
this.policyService = policyService;
}
@Timed
@@ -34,9 +39,14 @@ public class LegacyController {
.sorted(Comparator.comparing(LocalOpenChannel::getId))
.map(localOpenChannel -> {
Pubkey pubkey = localOpenChannel.getRemotePubkey();
long ppm = policyService.getPolicyTo(localOpenChannel.getId(), pubkey)
.map(Policy::feeRate)
.orElse(0L);
return localOpenChannel.getId().getCompactForm() +
"\t" + pubkey +
"\t" + localOpenChannel.getCapacity() +
"\t" + localOpenChannel.getCapacity().toStringSat() +
"\t" + localOpenChannel.getBalanceInformation().localAvailable().toStringSat() +
"\t" + ppm +
"\t" + nodeService.getAlias(pubkey);
})
.collect(Collectors.joining(NEWLINE));

26
web/src/test/java/de/cotto/lndmanagej/controller/LegacyControllerTest.java
View File

@@ -2,12 +2,14 @@ package de.cotto.lndmanagej.controller;
import de.cotto.lndmanagej.service.ChannelService;
import de.cotto.lndmanagej.service.NodeService;
import de.cotto.lndmanagej.service.PolicyService;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import java.util.Optional;
import java.util.Set;
import static de.cotto.lndmanagej.model.ChannelFixtures.CAPACITY;
@@ -18,6 +20,8 @@ import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHAN
import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_TO_NODE_3;
import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS_2;
import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS_3;
import static de.cotto.lndmanagej.model.PolicyFixtures.POLICY_1;
import static de.cotto.lndmanagej.model.PolicyFixtures.POLICY_2;
import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_2;
import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_3;
import static org.assertj.core.api.Assertions.assertThat;
@@ -34,15 +38,27 @@ class LegacyControllerTest {
@Mock
private ChannelService channelService;
@Mock
private PolicyService policyService;
@Test
void getOpenChannelIdsPretty() {
String balance1 = LOCAL_OPEN_CHANNEL.getBalanceInformation().localAvailable().toStringSat();
String balance2 = LOCAL_OPEN_CHANNEL_TO_NODE_3.getBalanceInformation().localAvailable().toStringSat();
long ppm1 = POLICY_1.feeRate();
long ppm2 = POLICY_2.feeRate();
when(policyService.getPolicyTo(LOCAL_OPEN_CHANNEL.getId(), LOCAL_OPEN_CHANNEL.getRemotePubkey()))
.thenReturn(Optional.of(POLICY_1));
when(policyService.getPolicyTo(LOCAL_OPEN_CHANNEL_TO_NODE_3.getId(), PUBKEY_3))
.thenReturn(Optional.of(POLICY_2));
when(nodeService.getAlias(PUBKEY_2)).thenReturn(ALIAS_2);
when(nodeService.getAlias(PUBKEY_3)).thenReturn(ALIAS_3);
when(channelService.getOpenChannels()).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_TO_NODE_3));
assertThat(legacyController.getOpenChannelIdsPretty()).isEqualTo(
CHANNEL_ID_COMPACT + "\t" + PUBKEY_2 + "\t" + CAPACITY + "\t" + ALIAS_2 + "\n" +
CHANNEL_ID_COMPACT_4 + "\t" + PUBKEY_3 + "\t" + CAPACITY_2 + "\t" + ALIAS_3
);
assertThat(legacyController.getOpenChannelIdsPretty())
.isEqualTo("%s\t%s\t%s\t%s\t%s\t%s\n%s\t%s\t%s\t%s\t%s\t%s".formatted(
CHANNEL_ID_COMPACT, PUBKEY_2, CAPACITY.toStringSat(), balance1, ppm1, ALIAS_2,
CHANNEL_ID_COMPACT_4, PUBKEY_3, CAPACITY_2.toStringSat(), balance2, ppm2, ALIAS_3
));
}
@Test
@@ -51,4 +67,4 @@ class LegacyControllerTest {
assertThat(legacyController.getOpenChannelIdsPretty())
.matches(CHANNEL_ID_COMPACT + ".*\n" + CHANNEL_ID_COMPACT_4 + ".*");
}
}
}