rename "policies" to "policies for local channel"

This commit is contained in:
Carsten Otto
2022-03-22 20:16:02 +01:00
parent 60f09236c5
commit aaf4cc9b37
20 changed files with 106 additions and 96 deletions

View File

@@ -13,7 +13,7 @@ import de.cotto.lndmanagej.model.ChannelId;
import de.cotto.lndmanagej.model.ClosedChannel;
import de.cotto.lndmanagej.model.LocalChannel;
import de.cotto.lndmanagej.model.OpenCloseStatus;
import de.cotto.lndmanagej.model.Policies;
import de.cotto.lndmanagej.model.PoliciesForLocalChannel;
import de.cotto.lndmanagej.service.BalanceService;
import de.cotto.lndmanagej.service.ChannelDetailsService;
import de.cotto.lndmanagej.service.ChannelService;
@@ -83,9 +83,9 @@ public class ChannelController {
public PoliciesDto getPolicies(@PathVariable ChannelId channelId) {
LocalChannel localChannel = channelService.getLocalChannel(channelId).orElse(null);
if (localChannel == null || localChannel.getStatus().openCloseStatus() != OpenCloseStatus.OPEN) {
return PoliciesDto.createFromModel(Policies.UNKNOWN);
return PoliciesDto.createFromModel(PoliciesForLocalChannel.UNKNOWN);
}
return PoliciesDto.createFromModel(policyService.getPolicies(localChannel.getId()));
return PoliciesDto.createFromModel(policyService.getPolicies(localChannel));
}
@Timed

View File

@@ -8,7 +8,7 @@ import de.cotto.lndmanagej.model.FlowReport;
import de.cotto.lndmanagej.model.LocalChannel;
import de.cotto.lndmanagej.model.OnChainCosts;
import de.cotto.lndmanagej.model.OpenInitiator;
import de.cotto.lndmanagej.model.Policies;
import de.cotto.lndmanagej.model.PoliciesForLocalChannel;
import de.cotto.lndmanagej.model.Pubkey;
import de.cotto.lndmanagej.model.RebalanceReport;
import de.cotto.lndmanagej.model.warnings.ChannelWarnings;
@@ -43,7 +43,7 @@ public record ChannelDetailsDto(
String remoteAlias,
BalanceInformation balanceInformation,
OnChainCosts onChainCosts,
Policies policies,
PoliciesForLocalChannel policiesForLocalChannel,
FeeReport feeReport,
FlowReport flowReport,
RebalanceReport rebalanceReport,
@@ -64,7 +64,7 @@ public record ChannelDetailsDto(
channelDto.status(),
BalanceInformationDto.createFromModel(balanceInformation),
OnChainCostsDto.createFromModel(onChainCosts),
PoliciesDto.createFromModel(policies),
PoliciesDto.createFromModel(policiesForLocalChannel),
channelDto.closeDetails(),
FeeReportDto.createFromModel(feeReport),
FlowReportDto.createFromModel(flowReport),
@@ -79,7 +79,7 @@ public record ChannelDetailsDto(
String remoteAlias,
BalanceInformation balanceInformation,
OnChainCosts onChainCosts,
Policies policies,
PoliciesForLocalChannel policiesForLocalChannel,
FeeReport feeReport,
FlowReport flowReport,
RebalanceReport rebalanceReport,
@@ -90,7 +90,7 @@ public record ChannelDetailsDto(
remoteAlias,
balanceInformation,
onChainCosts,
policies,
policiesForLocalChannel,
feeReport,
flowReport,
rebalanceReport,

View File

@@ -1,15 +1,15 @@
package de.cotto.lndmanagej.controller.dto;
import de.cotto.lndmanagej.model.Policies;
import de.cotto.lndmanagej.model.PoliciesForLocalChannel;
public record PoliciesDto(
PolicyDto local,
PolicyDto remote
) {
public static PoliciesDto createFromModel(Policies policies) {
public static PoliciesDto createFromModel(PoliciesForLocalChannel policiesForLocalChannel) {
return new PoliciesDto(
PolicyDto.createFromModel(policies.local()),
PolicyDto.createFromModel(policies.remote())
PolicyDto.createFromModel(policiesForLocalChannel.local()),
PolicyDto.createFromModel(policiesForLocalChannel.remote())
);
}
}