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

include MPP fee rate in output

Browse Source
This commit is contained in:
Carsten Otto
2022-03-27 19:14:27 +02:00
parent 73a84f44c7
commit 02ab2d8e09
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/integrationTest/java/de/cotto/lndmanagej/controller/PickhardtPaymentsControllerIT.java
View File

@@ -49,6 +49,7 @@ class PickhardtPaymentsControllerIT {
.andExpect(jsonPath("$.probability", is(expectedProbability)))
.andExpect(jsonPath("$.amountSat", is(amountAsString)))
.andExpect(jsonPath("$.feesMilliSat", is(feesAsString)))
.andExpect(jsonPath("$.feeRate", is(200)))
.andExpect(jsonPath("$.routes", hasSize(1)))
.andExpect(jsonPath("$.routes[0].amountSat", is(amountAsString)))
.andExpect(jsonPath("$.routes[0].channelIds", contains(CHANNEL_ID.toString())))
@@ -59,6 +60,7 @@ class PickhardtPaymentsControllerIT {
void send() throws Exception {
Coins amount = MULTI_PATH_PAYMENT.amount();
String amountAsString = String.valueOf(amount.satoshis());
String feesAsString = String.valueOf(MULTI_PATH_PAYMENT.fees().milliSatoshis());
double expectedProbability = MULTI_PATH_PAYMENT.probability();
when(multiPathPaymentSplitter.getMultiPathPaymentTo(PUBKEY, amount))
.thenReturn(MULTI_PATH_PAYMENT);
@@ -67,6 +69,8 @@ class PickhardtPaymentsControllerIT {
mockMvc.perform(get(PREFIX + "/from/" + PUBKEY + "/to/" + PUBKEY_2 + "/amount/" + 1_234))
.andExpect(jsonPath("$.probability", is(expectedProbability)))
.andExpect(jsonPath("$.amountSat", is(amountAsString)))
.andExpect(jsonPath("$.feesMilliSat", is(feesAsString)))
.andExpect(jsonPath("$.feeRate", is(200)))
.andExpect(jsonPath("$.routes", hasSize(1)))
.andExpect(jsonPath("$.routes[0].amountSat", is(amountAsString)))
.andExpect(jsonPath("$.routes[0].channelIds", contains(CHANNEL_ID.toString())))

9
web/src/main/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDto.java
View File

@@ -7,12 +7,19 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
public record MultiPathPaymentDto(String amountSat, double probability, String feesMilliSat, List<RouteDto> routes) {
public record MultiPathPaymentDto(
String amountSat,
double probability,
String feesMilliSat,
long feeRate,
List<RouteDto> routes
) {
public static MultiPathPaymentDto fromModel(MultiPathPayment multiPathPayment) {
return new MultiPathPaymentDto(
String.valueOf(multiPathPayment.amount().satoshis()),
multiPathPayment.probability(),
String.valueOf(multiPathPayment.fees().milliSatoshis()),
multiPathPayment.getFeeRate(),
getRoutes(multiPathPayment.routes())
);
}

1
web/src/test/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDtoTest.java
View File

@@ -18,6 +18,7 @@ class MultiPathPaymentDtoTest {
amountSat,
probability,
String.valueOf(MULTI_PATH_PAYMENT.fees().milliSatoshis()),
MULTI_PATH_PAYMENT.getFeeRate(),
List.of(new RouteDto(amountSat, List.of(CHANNEL_ID), probability, feesMilliSat)))
);
}