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

use metrics library for spring integration

Browse Source
This commit is contained in:
Carsten Otto
2021-11-30 15:43:04 +01:00
parent 7835750ac3
commit f7e76e3e8c
30 changed files with 116 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
web/src/test/java/de/cotto/lndmanagej/controller/ChannelControllerTest.java
View File

@@ -7,7 +7,6 @@ import de.cotto.lndmanagej.controller.dto.ClosedChannelDetailsDto;
import de.cotto.lndmanagej.controller.dto.FeeReportDto;
import de.cotto.lndmanagej.controller.dto.OnChainCostsDto;
import de.cotto.lndmanagej.controller.dto.PoliciesDto;
import de.cotto.lndmanagej.metrics.Metrics;
import de.cotto.lndmanagej.model.BalanceInformation;
import de.cotto.lndmanagej.model.CloseInitiator;
import de.cotto.lndmanagej.model.Coins;
@@ -39,9 +38,7 @@ import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_2;
import static de.cotto.lndmanagej.model.WaitingCloseChannelFixtures.WAITING_CLOSE_CHANNEL;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
@@ -64,9 +61,6 @@ class ChannelControllerTest {
@Mock
private NodeService nodeService;
@Mock
private Metrics metrics;
@Mock
private BalanceService balanceService;
@@ -98,7 +92,6 @@ class ChannelControllerTest {
ChannelDto basicInformation = new ChannelDto(LOCAL_OPEN_CHANNEL, ClosedChannelDetailsDto.UNKNOWN);
when(channelService.getLocalChannel(CHANNEL_ID)).thenReturn(Optional.of(LOCAL_OPEN_CHANNEL));
assertThat(channelController.getBasicInformation(CHANNEL_ID)).isEqualTo(basicInformation);
verify(metrics).mark(argThat(name -> name.endsWith(".getBasicInformation")));
}
@Test
@@ -106,7 +99,6 @@ class ChannelControllerTest {
ChannelDto basicInformation = new ChannelDto(CLOSED_CHANNEL, CLOSED_CHANNEL_DETAILS_DTO);
when(channelService.getLocalChannel(CHANNEL_ID)).thenReturn(Optional.of(CLOSED_CHANNEL));
assertThat(channelController.getBasicInformation(CHANNEL_ID)).isEqualTo(basicInformation);
verify(metrics).mark(argThat(name -> name.endsWith(".getBasicInformation")));
}
@Test
@@ -132,7 +124,6 @@ class ChannelControllerTest {
.thenReturn(Optional.ofNullable(LOCAL_OPEN_CHANNEL.getBalanceInformation()));
assertThat(channelController.getDetails(CHANNEL_ID)).isEqualTo(expectedDetails);
verify(metrics).mark(argThat(name -> name.endsWith(".getDetails")));
}
@Test
@@ -175,7 +166,6 @@ class ChannelControllerTest {
when(balanceService.getBalanceInformation(CHANNEL_ID)).thenReturn(Optional.of(BALANCE_INFORMATION));
assertThat(channelController.getBalance(CHANNEL_ID))
.isEqualTo(BalanceInformationDto.createFrom(BALANCE_INFORMATION));
verify(metrics).mark(argThat(name -> name.endsWith(".getBalance")));
}
@Test
@@ -183,7 +173,6 @@ class ChannelControllerTest {
when(balanceService.getBalanceInformation(CHANNEL_ID)).thenReturn(Optional.empty());
assertThat(channelController.getBalance(CHANNEL_ID))
.isEqualTo(BalanceInformationDto.createFrom(BalanceInformation.EMPTY));
verify(metrics).mark(argThat(name -> name.endsWith(".getBalance")));
}
@Test
@@ -191,7 +180,6 @@ class ChannelControllerTest {
when(channelService.getLocalChannel(CHANNEL_ID)).thenReturn(Optional.of(LOCAL_OPEN_CHANNEL));
when(policyService.getPolicies(CHANNEL_ID)).thenReturn(POLICIES);
assertThat(channelController.getPolicies(CHANNEL_ID)).isEqualTo(FEE_CONFIGURATION_DTO);
verify(metrics).mark(argThat(name -> name.endsWith(".getPolicies")));
}
@Test
@@ -203,7 +191,6 @@ class ChannelControllerTest {
void getCloseDetails() throws NotFoundException {
when(channelService.getClosedChannel(CHANNEL_ID)).thenReturn(Optional.of(CLOSED_CHANNEL));
assertThat(channelController.getCloseDetails(CHANNEL_ID)).isEqualTo(CLOSED_CHANNEL_DETAILS_DTO);
verify(metrics).mark(argThat(name -> name.endsWith(".getCloseDetails")));
}
@Test
@@ -216,7 +203,6 @@ class ChannelControllerTest {
void getFeeReport() {
when(feeService.getFeeReportForChannel(CHANNEL_ID)).thenReturn(FEE_REPORT);
assertThat(channelController.getFeeReport(CHANNEL_ID)).isEqualTo(FEE_REPORT_DTO);
verify(metrics).mark(argThat(name -> name.endsWith(".getFeeReport")));
}
private ChannelDetailsDto mockForChannelWithoutPolicies(

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

@@ -1,6 +1,5 @@
package de.cotto.lndmanagej.controller;
import de.cotto.lndmanagej.metrics.Metrics;
import de.cotto.lndmanagej.service.ChannelService;
import de.cotto.lndmanagej.service.NodeService;
import org.junit.jupiter.api.Test;
@@ -22,8 +21,6 @@ import static de.cotto.lndmanagej.model.NodeFixtures.ALIAS_3;
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;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
@@ -37,9 +34,6 @@ class LegacyControllerTest {
@Mock
private ChannelService channelService;
@Mock
private Metrics metrics;
@Test
void getOpenChannelIdsPretty() {
when(nodeService.getAlias(PUBKEY_2)).thenReturn(ALIAS_2);
@@ -49,7 +43,6 @@ class LegacyControllerTest {
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
);
verify(metrics).mark(argThat(name -> name.endsWith(".getOpenChannelIdsPretty")));
}
@Test

12
web/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java
View File

@@ -5,7 +5,6 @@ import de.cotto.lndmanagej.controller.dto.ChannelsForNodeDto;
import de.cotto.lndmanagej.controller.dto.FeeReportDto;
import de.cotto.lndmanagej.controller.dto.NodeDetailsDto;
import de.cotto.lndmanagej.controller.dto.OnChainCostsDto;
import de.cotto.lndmanagej.metrics.Metrics;
import de.cotto.lndmanagej.model.BalanceInformation;
import de.cotto.lndmanagej.model.Coins;
import de.cotto.lndmanagej.model.FeeReport;
@@ -44,8 +43,6 @@ import static de.cotto.lndmanagej.model.WaitingCloseChannelFixtures.WAITING_CLOS
import static de.cotto.lndmanagej.model.WaitingCloseChannelFixtures.WAITING_CLOSE_CHANNEL_2;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
@@ -58,9 +55,6 @@ class NodeControllerTest {
@Mock
private NodeService nodeService;
@Mock
private Metrics metrics;
@Mock
private ChannelService channelService;
@@ -78,7 +72,6 @@ class NodeControllerTest {
when(nodeService.getAlias(PUBKEY_2)).thenReturn(ALIAS_2);
assertThat(nodeController.getAlias(PUBKEY_2)).isEqualTo(ALIAS_2);
verify(metrics).mark(argThat(name -> name.endsWith(".getAlias")));
}
@Test
@@ -102,7 +95,6 @@ class NodeControllerTest {
when(nodeService.getNode(PUBKEY_2)).thenReturn(new Node(PUBKEY_2, ALIAS_2, 0, true));
assertThat(nodeController.getDetails(PUBKEY_2)).isEqualTo(expectedDetails);
verify(metrics).mark(argThat(name -> name.endsWith(".getDetails")));
}
@Test
@@ -143,7 +135,6 @@ class NodeControllerTest {
when(channelService.getOpenChannelsWith(PUBKEY)).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, LOCAL_OPEN_CHANNEL_3));
assertThat(nodeController.getOpenChannelIdsForPubkey(PUBKEY))
.isEqualTo(new ChannelsForNodeDto(PUBKEY, List.of(CHANNEL_ID, CHANNEL_ID_3)));
verify(metrics).mark(argThat(name -> name.endsWith(".getOpenChannelIdsForPubkey")));
}
@Test
@@ -158,7 +149,6 @@ class NodeControllerTest {
when(channelService.getAllChannelsWith(PUBKEY)).thenReturn(Set.of(LOCAL_OPEN_CHANNEL, CLOSED_CHANNEL_3));
assertThat(nodeController.getAllChannelIdsForPubkey(PUBKEY))
.isEqualTo(new ChannelsForNodeDto(PUBKEY, List.of(CHANNEL_ID, CHANNEL_ID_3)));
verify(metrics).mark(argThat(name -> name.endsWith(".getAllChannelIdsForPubkey")));
}
@Test
@@ -172,13 +162,11 @@ class NodeControllerTest {
void getBalance() {
when(balanceService.getBalanceInformation(PUBKEY)).thenReturn(BALANCE_INFORMATION);
assertThat(nodeController.getBalance(PUBKEY)).isEqualTo(BalanceInformationDto.createFrom(BALANCE_INFORMATION));
verify(metrics).mark(argThat(name -> name.endsWith(".getBalance")));
}
@Test
void getFeeReport() {
when(feeService.getFeeReportForPeer(PUBKEY)).thenReturn(FEE_REPORT);
assertThat(nodeController.getFeeReport(PUBKEY)).isEqualTo(new FeeReportDto("1234", "567"));
verify(metrics).mark(argThat(name -> name.endsWith(".getFeeReport")));
}
}

11
web/src/test/java/de/cotto/lndmanagej/controller/OnChainCostsControllerTest.java
View File

@@ -1,7 +1,6 @@
package de.cotto.lndmanagej.controller;
import de.cotto.lndmanagej.controller.dto.OnChainCostsDto;
import de.cotto.lndmanagej.metrics.Metrics;
import de.cotto.lndmanagej.model.Coins;
import de.cotto.lndmanagej.service.OnChainCostService;
import org.junit.jupiter.api.Test;
@@ -16,8 +15,6 @@ import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID;
import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
@@ -28,18 +25,14 @@ class OnChainCostsControllerTest {
@Mock
private OnChainCostService onChainCostService;
@Mock
private Metrics metrics;
@Test
void getCostsForPeer() throws CostException {
void getCostsForPeer() {
Coins openCosts = Coins.ofSatoshis(123);
Coins closeCosts = Coins.ofSatoshis(456);
when(onChainCostService.getOpenCostsWith(PUBKEY)).thenReturn(openCosts);
when(onChainCostService.getCloseCostsWith(PUBKEY)).thenReturn(closeCosts);
OnChainCostsDto expected = new OnChainCostsDto(openCosts, closeCosts);
assertThat(onChainCostsController.getCostsForPeer(PUBKEY)).isEqualTo(expected);
verify(metrics).mark(argThat(name -> name.endsWith(".getCostsForPeer")));
}
@Test
@@ -47,7 +40,6 @@ class OnChainCostsControllerTest {
Coins coins = Coins.ofSatoshis(123);
when(onChainCostService.getOpenCosts(CHANNEL_ID)).thenReturn(Optional.of(coins));
assertThat(onChainCostsController.getOpenCostsForChannel(CHANNEL_ID)).isEqualTo(coins.satoshis());
verify(metrics).mark(argThat(name -> name.endsWith(".getOpenCostsForChannel")));
}
@Test
@@ -62,7 +54,6 @@ class OnChainCostsControllerTest {
Coins coins = Coins.ofSatoshis(123);
when(onChainCostService.getCloseCosts(CHANNEL_ID)).thenReturn(Optional.of(coins));
assertThat(onChainCostsController.getCloseCostsForChannel(CHANNEL_ID)).isEqualTo(coins.satoshis());
verify(metrics).mark(argThat(name -> name.endsWith(".getCloseCostsForChannel")));
}
@Test

12
web/src/test/java/de/cotto/lndmanagej/controller/StatusControllerTest.java
View File

@@ -2,7 +2,6 @@ package de.cotto.lndmanagej.controller;
import de.cotto.lndmanagej.controller.dto.ChannelsDto;
import de.cotto.lndmanagej.controller.dto.PubkeysDto;
import de.cotto.lndmanagej.metrics.Metrics;
import de.cotto.lndmanagej.model.ChannelId;
import de.cotto.lndmanagej.model.Pubkey;
import de.cotto.lndmanagej.service.ChannelService;
@@ -24,8 +23,6 @@ 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.PubkeyFixtures.PUBKEY_2;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
@@ -36,9 +33,6 @@ class StatusControllerTest {
@Mock
private OwnNodeService ownNodeService;
@Mock
private Metrics metrics;
@Mock
private ChannelService channelService;
@@ -47,7 +41,6 @@ class StatusControllerTest {
when(ownNodeService.isSyncedToChain()).thenReturn(true);
assertThat(statusController.isSyncedToChain()).isTrue();
verify(metrics).mark(argThat(name -> name.endsWith(".isSyncedToChain")));
}
@Test
@@ -62,7 +55,6 @@ class StatusControllerTest {
List<ChannelId> expectedChannelIds =
List.of(LOCAL_OPEN_CHANNEL.getId(), LOCAL_OPEN_CHANNEL_TO_NODE_3.getId());
assertThat(statusController.getOpenChannels()).isEqualTo(new ChannelsDto(expectedChannelIds));
verify(metrics).mark(argThat(name -> name.endsWith(".getOpenChannels")));
}
@Test
@@ -71,7 +63,6 @@ class StatusControllerTest {
List<Pubkey> expectedPubkeys =
List.of(LOCAL_OPEN_CHANNEL.getRemotePubkey(), LOCAL_OPEN_CHANNEL_TO_NODE_3.getRemotePubkey());
assertThat(statusController.getPubkeysForOpenChannels()).isEqualTo(new PubkeysDto(expectedPubkeys));
verify(metrics).mark(argThat(name -> name.endsWith(".getPubkeysForOpenChannels")));
}
@Test
@@ -86,7 +77,6 @@ class StatusControllerTest {
List<ChannelId> expectedChannelIds =
List.of(CLOSED_CHANNEL.getId(), LOCAL_OPEN_CHANNEL_TO_NODE_3.getId());
assertThat(statusController.getAllChannels()).isEqualTo(new ChannelsDto(expectedChannelIds));
verify(metrics).mark(argThat(name -> name.endsWith(".getAllChannels")));
}
@Test
@@ -95,7 +85,6 @@ class StatusControllerTest {
List<Pubkey> expectedPubkeys =
List.of(CLOSED_CHANNEL.getRemotePubkey(), LOCAL_OPEN_CHANNEL_TO_NODE_3.getRemotePubkey());
assertThat(statusController.getPubkeysForAllChannels()).isEqualTo(new PubkeysDto(expectedPubkeys));
verify(metrics).mark(argThat(name -> name.endsWith(".getPubkeysForAllChannels")));
}
@Test
@@ -108,6 +97,5 @@ class StatusControllerTest {
void getBlockHeight() {
when(ownNodeService.getBlockHeight()).thenReturn(123_456);
assertThat(statusController.getBlockHeight()).isEqualTo(123_456);
verify(metrics).mark(argThat(name -> name.endsWith(".getBlockHeight")));
}
}