From 86f62f60acab5be72eb09c73b37101ad2e0ded4b Mon Sep 17 00:00:00 2001
From: Carsten Otto <git@c-otto.de>
Date: Sun, 22 May 2022 17:45:13 +0200
Subject: [PATCH] remove redundant amount from invoice memo

---
 .../cotto/lndmanagej/pickhardtpayments/TopUpService.java  | 6 +++---
 .../lndmanagej/pickhardtpayments/TopUpServiceTest.java    | 8 ++------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/TopUpService.java b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/TopUpService.java
index cb6d13f8..13c00e57 100644
--- a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/TopUpService.java
+++ b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/TopUpService.java
@@ -100,7 +100,7 @@ public class TopUpService {
     }
 
     private Optional<DecodedPaymentRequest> getPaymentRequest(Pubkey pubkey, Coins topUpAmount) {
-        String description = getDescription(pubkey, topUpAmount);
+        String description = getDescription(pubkey);
         return grpcInvoices.createPaymentRequest(topUpAmount, description, getExpiry());
     }
 
@@ -108,8 +108,8 @@ public class TopUpService {
         return Duration.ofSeconds(configurationService.getIntegerValue(EXPIRY).orElse(DEFAULT_EXPIRY));
     }
 
-    private String getDescription(Pubkey pubkey, Coins amount) {
+    private String getDescription(Pubkey pubkey) {
         String alias = nodeService.getAlias(pubkey);
-        return "Topping up channel with %s (%s), adding %s".formatted(pubkey, alias, amount);
+        return "Topping up channel with %s (%s)".formatted(pubkey, alias);
     }
 }
diff --git a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/TopUpServiceTest.java b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/TopUpServiceTest.java
index 476572a7..972f0469 100644
--- a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/TopUpServiceTest.java
+++ b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/TopUpServiceTest.java
@@ -39,7 +39,7 @@ import static org.mockito.Mockito.when;
 class TopUpServiceTest {
     private static final Coins AMOUNT = Coins.ofSatoshis(123_000);
     private static final Coins DEFAULT_THRESHOLD = Coins.ofSatoshis(10_000);
-    private static final String DESCRIPTION_PREFIX = "Topping up channel with " + PUBKEY + " (alias), adding ";
+    private static final String DESCRIPTION = "Topping up channel with " + PUBKEY + " (alias)";
     private static final long OUR_FEE_RATE = 1234;
     private static final long PEER_FEE_RATE = 1233;
     private static final Duration DEFAULT_EXPIRY = Duration.ofMinutes(10);
@@ -182,11 +182,7 @@ class TopUpServiceTest {
 
     private void assertTopUp(Coins expectedTopUpAmount, Duration expiry) {
         PaymentStatus paymentStatus = topUpService.topUp(PUBKEY, AMOUNT);
-        verify(grpcInvoices).createPaymentRequest(
-                expectedTopUpAmount,
-                DESCRIPTION_PREFIX + expectedTopUpAmount,
-                expiry
-        );
+        verify(grpcInvoices).createPaymentRequest(expectedTopUpAmount, DESCRIPTION, expiry);
         PaymentOptions paymentOptions = PaymentOptions.forTopUp(OUR_FEE_RATE, PUBKEY);
         verify(multiPathPaymentSender).payPaymentRequest(DECODED_PAYMENT_REQUEST, paymentOptions);
         assertThat(paymentStatus.isPending()).isTrue();