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

use aggregated information from fee service

Browse Source
This commit is contained in:
Carsten Otto
2021-11-24 10:50:31 +01:00
parent fff6a10c4a
commit 3b21b3238a
10 changed files with 72 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,6 @@ 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;
@@ -21,6 +20,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import java.util.Optional;
import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID;
import static de.cotto.lndmanagej.model.FeeConfigurationFixtures.FEE_CONFIGURATION;
import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL;
import static de.cotto.lndmanagej.model.LocalOpenChannelFixtures.LOCAL_OPEN_CHANNEL_PRIVATE;
import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS_2;
@@ -37,8 +37,6 @@ 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

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

@@ -2,6 +2,7 @@ package de.cotto.lndmanagej.controller;
import de.cotto.lndmanagej.metrics.Metrics;
import de.cotto.lndmanagej.model.Coins;
import de.cotto.lndmanagej.model.FeeConfigurationFixtures;
import de.cotto.lndmanagej.service.BalanceService;
import de.cotto.lndmanagej.service.ChannelService;
import de.cotto.lndmanagej.service.FeeService;
@@ -166,32 +167,32 @@ class LegacyControllerTest {
assertThat(legacyController.getPeerPubkeys()).isEqualTo(PUBKEY_2.toString());
}
@Test
void getIncomingFeeRate() {
when(feeService.getIncomingFeeRate(CHANNEL_ID)).thenReturn(123L);
assertThat(legacyController.getIncomingFeeRate(CHANNEL_ID)).isEqualTo(123);
verify(metrics).mark(argThat(name -> name.endsWith(".getIncomingFeeRate")));
}
@Test
void getOutgoingFeeRate() {
when(feeService.getOutgoingFeeRate(CHANNEL_ID)).thenReturn(123L);
assertThat(legacyController.getOutgoingFeeRate(CHANNEL_ID)).isEqualTo(123);
when(feeService.getFeeConfiguration(CHANNEL_ID)).thenReturn(FeeConfigurationFixtures.FEE_CONFIGURATION);
assertThat(legacyController.getOutgoingFeeRate(CHANNEL_ID)).isEqualTo(1);
verify(metrics).mark(argThat(name -> name.endsWith(".getOutgoingFeeRate")));
}
@Test
void getIncomingBaseFee() {
when(feeService.getIncomingBaseFee(CHANNEL_ID)).thenReturn(Coins.ofMilliSatoshis(10L));
assertThat(legacyController.getIncomingBaseFee(CHANNEL_ID)).isEqualTo(10);
verify(metrics).mark(argThat(name -> name.endsWith(".getIncomingBaseFee")));
void getOutgoingBaseFee() {
when(feeService.getFeeConfiguration(CHANNEL_ID)).thenReturn(FeeConfigurationFixtures.FEE_CONFIGURATION);
assertThat(legacyController.getOutgoingBaseFee(CHANNEL_ID)).isEqualTo(2);
verify(metrics).mark(argThat(name -> name.endsWith(".getOutgoingBaseFee")));
}
@Test
void getOutgoingBaseFee() {
when(feeService.getOutgoingBaseFee(CHANNEL_ID)).thenReturn(Coins.ofMilliSatoshis(10L));
assertThat(legacyController.getOutgoingBaseFee(CHANNEL_ID)).isEqualTo(10);
verify(metrics).mark(argThat(name -> name.endsWith(".getOutgoingBaseFee")));
void getIncomingFeeRate() {
when(feeService.getFeeConfiguration(CHANNEL_ID)).thenReturn(FeeConfigurationFixtures.FEE_CONFIGURATION);
assertThat(legacyController.getIncomingFeeRate(CHANNEL_ID)).isEqualTo(3);
verify(metrics).mark(argThat(name -> name.endsWith(".getIncomingFeeRate")));
}
@Test
void getIncomingBaseFee() {
when(feeService.getFeeConfiguration(CHANNEL_ID)).thenReturn(FeeConfigurationFixtures.FEE_CONFIGURATION);
assertThat(legacyController.getIncomingBaseFee(CHANNEL_ID)).isEqualTo(4);
verify(metrics).mark(argThat(name -> name.endsWith(".getIncomingBaseFee")));
}
@Test

7
web/src/test/java/de/cotto/lndmanagej/controller/dto/FeeConfigurationDtoTest.java
View File

@@ -1,9 +1,8 @@
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 de.cotto.lndmanagej.model.FeeConfigurationFixtures.FEE_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
class FeeConfigurationDtoTest {
@@ -11,9 +10,7 @@ class FeeConfigurationDtoTest {
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);
FeeConfigurationDto dto = FeeConfigurationDto.createFrom(FEE_CONFIGURATION);
assertThat(dto).isEqualTo(expected);
}