diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/PickhardtPaymentsControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/PickhardtPaymentsControllerIT.java index db3ef2f1..e24e1158 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/PickhardtPaymentsControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/PickhardtPaymentsControllerIT.java @@ -41,12 +41,14 @@ class PickhardtPaymentsControllerIT { void sendTo() 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); mockMvc.perform(get(PREFIX + "/to/" + PUBKEY + "/amount/" + amount.satoshis())) .andExpect(jsonPath("$.probability", is(expectedProbability))) .andExpect(jsonPath("$.amountSat", is(amountAsString))) + .andExpect(jsonPath("$.feesMilliSat", is(feesAsString))) .andExpect(jsonPath("$.routes", hasSize(1))) .andExpect(jsonPath("$.routes[0].amountSat", is(amountAsString))) .andExpect(jsonPath("$.routes[0].channelIds", contains(CHANNEL_ID.toString()))) diff --git a/web/src/main/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDto.java b/web/src/main/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDto.java index 5ca537f6..624413c0 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDto.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDto.java @@ -7,11 +7,12 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -public record MultiPathPaymentDto(String amountSat, double probability, List routes) { +public record MultiPathPaymentDto(String amountSat, double probability, String feesMilliSat, List routes) { public static MultiPathPaymentDto fromModel(MultiPathPayment multiPathPayment) { return new MultiPathPaymentDto( String.valueOf(multiPathPayment.amount().satoshis()), multiPathPayment.probability(), + String.valueOf(multiPathPayment.fees().milliSatoshis()), getRoutes(multiPathPayment.routes()) ); } diff --git a/web/src/test/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDtoTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDtoTest.java index 7436834f..b6032330 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDtoTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDtoTest.java @@ -16,6 +16,7 @@ class MultiPathPaymentDtoTest { assertThat(MultiPathPaymentDto.fromModel(MULTI_PATH_PAYMENT)).isEqualTo(new MultiPathPaymentDto( amountSat, probability, + String.valueOf(MULTI_PATH_PAYMENT.fees().milliSatoshis()), List.of(new RouteDto(amountSat, List.of(CHANNEL_ID), probability))) ); }