Allowing settlement of unused channel

bitcoinj · Sep 4, 2015 · 7c8c2a4 · 7c8c2a4
1 parent fc9ae41
commit 7c8c2a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerState.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerState.java
@@ -398,7 +398,7 @@ public synchronized ListenableFuture<Transaction> close() throws InsufficientMon
             wallet.completeTx(req);  // TODO: Fix things so shuffling is usable.
             feePaidForPayment = req.tx.getFee();
             log.info("Calculated fee is {}", feePaidForPayment);
-            if (feePaidForPayment.compareTo(bestValueToMe) >= 0) {
+            if (feePaidForPayment.compareTo(bestValueToMe) > 0) {
                 final String msg = String.format("Had to pay more in fees (%s) than the channel was worth (%s)",
                         feePaidForPayment, bestValueToMe);
                 throw new InsufficientMoneyException(feePaidForPayment.subtract(bestValueToMe), msg);

diff --git a/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelStateTest.java b/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelStateTest.java
@@ -705,8 +705,8 @@ protected void editContractSendRequest(Wallet.SendRequest req) {
             assertTrue(e.getMessage().contains("more in fees"));
         }
 
-        signature = clientState.incrementPaymentBy(SATOSHI.multiply(2), null).signature.encodeToBitcoin();
-        totalRefund = totalRefund.subtract(SATOSHI.multiply(2));
+        signature = clientState.incrementPaymentBy(SATOSHI, null).signature.encodeToBitcoin();
+        totalRefund = totalRefund.subtract(SATOSHI);
         serverState.incrementPayment(totalRefund, signature);
 
         // And settle the channel.