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

compute channel details in service

Browse Source 
lots of refactoring, changes API
This commit is contained in:
Carsten Otto
2021-12-17 10:31:59 +01:00
parent 690960afc4
commit 71d12e52bb
40 changed files with 797 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
web/src/main/java/de/cotto/lndmanagej/controller/NodeController.java
View File

@@ -6,20 +6,16 @@ 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.ObjectMapperConfiguration;
import de.cotto.lndmanagej.controller.dto.OffChainCostsDto;
import de.cotto.lndmanagej.controller.dto.OnChainCostsDto;
import de.cotto.lndmanagej.model.BalanceInformation;
import de.cotto.lndmanagej.model.Channel;
import de.cotto.lndmanagej.model.ChannelId;
import de.cotto.lndmanagej.model.Node;
import de.cotto.lndmanagej.model.OffChainCosts;
import de.cotto.lndmanagej.model.OnChainCosts;
import de.cotto.lndmanagej.model.Pubkey;
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.OffChainCostService;
import de.cotto.lndmanagej.service.OnChainCostService;
import de.cotto.lndmanagej.service.RebalanceService;
import org.springframework.context.annotation.Import;
@@ -38,7 +34,6 @@ public class NodeController {
private final NodeService nodeService;
private final ChannelService channelService;
private final OnChainCostService onChainCostService;
private final OffChainCostService offChainCostService;
private final BalanceService balanceService;
private final FeeService feeService;
private final RebalanceService rebalanceService;
@@ -47,7 +42,6 @@ public class NodeController {
NodeService nodeService,
ChannelService channelService,
OnChainCostService onChainCostService,
OffChainCostService offChainCostService,
BalanceService balanceService,
FeeService feeService,
RebalanceService rebalanceService
@@ -55,7 +49,6 @@ public class NodeController {
this.nodeService = nodeService;
this.channelService = channelService;
this.onChainCostService = onChainCostService;
this.offChainCostService = offChainCostService;
this.balanceService = balanceService;
this.feeService = feeService;
this.rebalanceService = rebalanceService;
@@ -72,7 +65,6 @@ public class NodeController {
public NodeDetailsDto getDetails(@PathVariable Pubkey pubkey) {
Node node = nodeService.getNode(pubkey);
OnChainCosts onChainCosts = onChainCostService.getOnChainCostsForPeer(pubkey);
OffChainCosts offChainCosts = offChainCostService.getOffChainCostsForPeer(pubkey);
BalanceInformation balanceInformation = balanceService.getBalanceInformationForPeer(pubkey);
return new NodeDetailsDto(
pubkey,
@@ -81,13 +73,11 @@ public class NodeController {
toSortedList(channelService.getClosedChannelsWith(pubkey)),
toSortedList(channelService.getWaitingCloseChannelsWith(pubkey)),
toSortedList(channelService.getForceClosingChannelsWith(pubkey)),
OnChainCostsDto.createFromModel(onChainCosts),
OffChainCostsDto.createFromModel(offChainCosts),
BalanceInformationDto.createFromModel(balanceInformation),
onChainCosts,
balanceInformation,
node.online(),
getFeeReportDto(pubkey),
String.valueOf(rebalanceService.getRebalanceAmountFromPeer(pubkey).milliSatoshis()),
String.valueOf(rebalanceService.getRebalanceAmountToPeer(pubkey).milliSatoshis())
feeService.getFeeReportForPeer(pubkey),
rebalanceService.getReportForPeer(pubkey)
);
}
@@ -114,10 +104,6 @@ public class NodeController {
@Timed
@GetMapping("/fee-report")
public FeeReportDto getFeeReport(@PathVariable Pubkey pubkey) {
return getFeeReportDto(pubkey);
}
private FeeReportDto getFeeReportDto(Pubkey pubkey) {
return FeeReportDto.createFromModel(feeService.getFeeReportForPeer(pubkey));
}