From c06487faeb47f153199beb5b71da737d358ad1c5 Mon Sep 17 00:00:00 2001 From: Carsten Otto Date: Fri, 27 May 2022 23:31:08 +0200 Subject: [PATCH] fix: do not override payment options for top-up --- .../controller/PickhardtPaymentsControllerIT.java | 9 ++++++++- .../controller/PickhardtPaymentsController.java | 2 +- .../controller/PickhardtPaymentsControllerTest.java | 9 ++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) 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 948dd7b5..4b4a87c9 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/PickhardtPaymentsControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/PickhardtPaymentsControllerIT.java @@ -177,9 +177,16 @@ class PickhardtPaymentsControllerIT { @Test void topUp() throws Exception { + PaymentOptions emptyPaymentOptions = new PaymentOptions( + Optional.empty(), + Optional.empty(), + Optional.empty(), + true, + Optional.empty() + ); String url = "%s/top-up/%s/amount/%s".formatted(PREFIX, PUBKEY, "123"); mockMvc.perform(get(url)).andExpect(status().isOk()); - verify(topUpService).topUp(PUBKEY, Coins.ofSatoshis(123), DEFAULT_PAYMENT_OPTIONS); + verify(topUpService).topUp(PUBKEY, Coins.ofSatoshis(123), emptyPaymentOptions); } @Test diff --git a/web/src/main/java/de/cotto/lndmanagej/controller/PickhardtPaymentsController.java b/web/src/main/java/de/cotto/lndmanagej/controller/PickhardtPaymentsController.java index 74abe708..e7d2134c 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/PickhardtPaymentsController.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/PickhardtPaymentsController.java @@ -116,7 +116,7 @@ public class PickhardtPaymentsController { @Timed @GetMapping("/top-up/{pubkey}/amount/{amount}") public ResponseEntity topUp(@PathVariable Pubkey pubkey, @PathVariable long amount) { - return topUp(pubkey, amount, PAYMENT_OPTIONS_DTO); + return topUp(pubkey, amount, new PaymentOptionsDto()); } @Timed diff --git a/web/src/test/java/de/cotto/lndmanagej/controller/PickhardtPaymentsControllerTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/PickhardtPaymentsControllerTest.java index 291e09a1..42de91b6 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/PickhardtPaymentsControllerTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/PickhardtPaymentsControllerTest.java @@ -140,8 +140,15 @@ class PickhardtPaymentsControllerTest { @Test void topUp() { + PaymentOptions emptyPaymentOptions = new PaymentOptions( + Optional.empty(), + Optional.empty(), + Optional.empty(), + true, + Optional.empty() + ); assertThat(controller.topUp(PUBKEY, 123).getStatusCode()).isEqualTo(HttpStatus.OK); - verify(topUpService).topUp(PUBKEY, Coins.ofSatoshis(123), DEFAULT_PAYMENT_OPTIONS); + verify(topUpService).topUp(PUBKEY, Coins.ofSatoshis(123), emptyPaymentOptions); } @Test