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

include fee configuration in channel details

Browse Source
This commit is contained in:
Carsten Otto
2021-11-24 10:39:59 +01:00
parent aefcb3c200
commit fff6a10c4a
12 changed files with 187 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
web/src/test/java/de/cotto/lndmanagej/controller/ChannelDetailsControllerTest.java
View File

@@ -1,11 +1,14 @@
package de.cotto.lndmanagej.controller;
import de.cotto.lndmanagej.controller.dto.ChannelDetailsDto;
import de.cotto.lndmanagej.controller.dto.FeeConfigurationDto;
import de.cotto.lndmanagej.controller.dto.OnChainCostsDto;
import de.cotto.lndmanagej.metrics.Metrics;
import de.cotto.lndmanagej.model.Coins;
import de.cotto.lndmanagej.model.FeeConfiguration;
import de.cotto.lndmanagej.service.BalanceService;
import de.cotto.lndmanagej.service.ChannelService;
import de.cotto.lndmanagej.service.FeeService;
import de.cotto.lndmanagej.service.NodeService;
import de.cotto.lndmanagej.service.OnChainCostService;
import org.junit.jupiter.api.BeforeEach;
@@ -34,6 +37,10 @@ class ChannelDetailsControllerTest {
private static final Coins OPEN_COSTS = Coins.ofSatoshis(1);
private static final Coins CLOSE_COSTS = Coins.ofSatoshis(2);
private static final OnChainCostsDto ON_CHAIN_COSTS = new OnChainCostsDto(OPEN_COSTS, CLOSE_COSTS);
private static final FeeConfiguration FEE_CONFIGURATION =
new FeeConfiguration(1, Coins.ofMilliSatoshis(2), 3, Coins.ofMilliSatoshis(4));
private static final FeeConfigurationDto FEE_CONFIGURATION_DTO = FeeConfigurationDto.createFrom(FEE_CONFIGURATION);
@InjectMocks
private ChannelDetailsController channelDetailsController;
@@ -52,10 +59,14 @@ class ChannelDetailsControllerTest {
@Mock
private OnChainCostService onChainCostService;
@Mock
private FeeService feeService;
@BeforeEach
void setUp() {
lenient().when(onChainCostService.getOpenCosts(CHANNEL_ID)).thenReturn(Optional.of(OPEN_COSTS));
lenient().when(onChainCostService.getCloseCosts(CHANNEL_ID)).thenReturn(Optional.of(CLOSE_COSTS));
lenient().when(feeService.getFeeConfiguration(CHANNEL_ID)).thenReturn(FEE_CONFIGURATION);
}
@Test
@@ -70,7 +81,8 @@ class ChannelDetailsControllerTest {
LOCAL_OPEN_CHANNEL,
ALIAS_2,
LOCAL_OPEN_CHANNEL.getBalanceInformation(),
ON_CHAIN_COSTS
ON_CHAIN_COSTS,
FEE_CONFIGURATION_DTO
);
when(nodeService.getAlias(PUBKEY_2)).thenReturn(ALIAS_2);
when(channelService.getLocalChannel(CHANNEL_ID)).thenReturn(Optional.of(LOCAL_OPEN_CHANNEL));
@@ -87,7 +99,8 @@ class ChannelDetailsControllerTest {
LOCAL_OPEN_CHANNEL_PRIVATE,
ALIAS_2,
LOCAL_OPEN_CHANNEL_PRIVATE.getBalanceInformation(),
ON_CHAIN_COSTS
ON_CHAIN_COSTS,
FEE_CONFIGURATION_DTO
);
when(nodeService.getAlias(PUBKEY_2)).thenReturn(ALIAS_2);
when(channelService.getLocalChannel(CHANNEL_ID)).thenReturn(Optional.of(LOCAL_OPEN_CHANNEL_PRIVATE));

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

@@ -18,8 +18,10 @@ import static org.assertj.core.api.Assertions.assertThat;
class ChannelDetailsDtoTest {
private static final OnChainCostsDto ON_CHAIN_COSTS = new OnChainCostsDto(Coins.ofSatoshis(1), Coins.ofSatoshis(2));
private static final FeeConfigurationDto FEE_CONFIGURATION_DTO =
new FeeConfigurationDto(0, 0, 0, 0);
private static final ChannelDetailsDto CHANNEL_DETAILS_DTO =
new ChannelDetailsDto(CLOSED_CHANNEL, ALIAS, BALANCE_INFORMATION, ON_CHAIN_COSTS);
new ChannelDetailsDto(CLOSED_CHANNEL, ALIAS, BALANCE_INFORMATION, ON_CHAIN_COSTS, FEE_CONFIGURATION_DTO);
@Test
void channelIdShort() {
@@ -63,8 +65,13 @@ class ChannelDetailsDtoTest {
@Test
void status() {
ChannelDetailsDto dto =
new ChannelDetailsDto(LOCAL_OPEN_CHANNEL, ALIAS, BALANCE_INFORMATION, ON_CHAIN_COSTS);
ChannelDetailsDto dto = new ChannelDetailsDto(
LOCAL_OPEN_CHANNEL,
ALIAS,
BALANCE_INFORMATION,
ON_CHAIN_COSTS,
FEE_CONFIGURATION_DTO
);
ChannelStatusDto channelStatusDto =
ChannelStatusDto.createFrom(new ChannelStatus(false, true, false, OPEN));
assertThat(dto.status()).isEqualTo(channelStatusDto);

20
web/src/test/java/de/cotto/lndmanagej/controller/dto/FeeConfigurationDtoTest.java Normal file
View File

@@ -0,0 +1,20 @@
package de.cotto.lndmanagej.controller.dto;
import de.cotto.lndmanagej.model.Coins;
import de.cotto.lndmanagej.model.FeeConfiguration;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
class FeeConfigurationDtoTest {
@Test
void createFrom() {
FeeConfigurationDto expected = new FeeConfigurationDto(1, 2, 3, 4);
FeeConfiguration feeConfiguration =
new FeeConfiguration(1, Coins.ofMilliSatoshis(2), 3, Coins.ofMilliSatoshis(4));
FeeConfigurationDto dto = FeeConfigurationDto.createFrom(feeConfiguration);
assertThat(dto).isEqualTo(expected);
}
}