Eclair-related updates

btcpayserver · Dec 14, 2022 · d9efec3 · d9efec3
1 parent 9ed88c7
commit d9efec3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/src/BTCPayServer.Lightning.Eclair/EclairClient.cs b/src/BTCPayServer.Lightning.Eclair/EclairClient.cs
@@ -8,10 +8,8 @@
 using System.Threading.Tasks;
 using BTCPayServer.Lightning.Eclair.Models;
 using NBitcoin;
-using NBitcoin.Protocol;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Serialization;
 
 namespace BTCPayServer.Lightning.Eclair
 {
@@ -21,7 +19,7 @@ public class EclairClient
         private readonly string _username;
         private readonly string _password;
         private readonly HttpClient _httpClient;
-        private static readonly HttpClient SharedClient = new HttpClient();
+        private static readonly HttpClient SharedClient = new ();
 
         public Network Network { get; }
 

diff --git a/src/BTCPayServer.Lightning.Eclair/EclairLightningClient.cs b/src/BTCPayServer.Lightning.Eclair/EclairLightningClient.cs
@@ -222,7 +222,7 @@ public async Task<LightningNodeBalance> GetBalance(CancellationToken cancellatio
             {
                 Opening = 
                     global.Offchain.WaitForFundingConfirmed + 
-                    global.Offchain.WaitForFundingLocked + 
+                    global.Offchain.WaitForChannelReady + 
                     global.Offchain.WaitForPublishFutureCommitment,
                 Local = global.Offchain.Normal.ToLocal,
                 Remote = usable.Sum(channel => channel.CanReceive),

diff --git a/src/BTCPayServer.Lightning.Eclair/Models/GlobalBalanceResponse.cs b/src/BTCPayServer.Lightning.Eclair/Models/GlobalBalanceResponse.cs
@@ -31,9 +31,9 @@ public class GlobalOffchainBalance
         [JsonConverter(typeof(LightMoneyJsonConverter))]
         public LightMoney WaitForFundingConfirmed { get; set; }
 
-        [JsonProperty("waitForFundingLocked")]
+        [JsonProperty("waitForChannelReady")]
         [JsonConverter(typeof(LightMoneyJsonConverter))]
-        public LightMoney WaitForFundingLocked { get; set; }
+        public LightMoney WaitForChannelReady { get; set; }
 
         [JsonProperty("waitForPublishFutureCommitment")]
         [JsonConverter(typeof(LightMoneyJsonConverter))]

diff --git a/tests/CommonTests.cs b/tests/CommonTests.cs
@@ -67,6 +67,8 @@ public async Task CanCreateInvoice()
                 retrievedInvoice = await client.Client.GetInvoice("lol");
                 Assert.Null(retrievedInvoice);
 
+                await Task.Delay(1000);
+
                 var invoices = await client.Client.ListInvoices();
                 Assert.Contains(invoices, invoice => invoice.Id == createdInvoice.Id);
 
@@ -290,7 +292,7 @@ public async Task CanGetBalance()
                         Assert.InRange(balance.OffchainBalance.Remote, lowerBound, upperBound);
                         Assert.Equal(LightMoney.Zero, balance.OffchainBalance.Closing);
                         Logs.Tester.LogInformation($"{test.Name}: {Pretty(balance)}");
-                        if (!(client is EclairLightningClient))
+                        if (client is not EclairLightningClient)
                         {
                             // make sure we catch msat/sat bugs
                             // Eclair can't check this, because it uses the same wallet as bitcoin core
@@ -502,6 +504,8 @@ public async Task CanPayInvoiceAndReceive()
                 Assert.Equal(amount, paidInvoice.Amount);
                 Assert.Equal(amount, paidInvoice.AmountReceived);
 
+                await Task.Delay(1000);
+
                 // check invoices lists: not present in pending, but in general list
                 var onlyPending = new ListInvoicesParams { PendingOnly = true };
                 var invoices = await test.Merchant.ListInvoices(onlyPending);

diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
@@ -181,7 +181,7 @@ services:
   eclair:
     restart: unless-stopped
     stop_signal: SIGKILL
-    image: acinq/eclair:latest
+    image: acinq/eclair:release-0.8.0
     environment:
       JAVA_OPTS: |
         -Xmx256m
@@ -223,7 +223,7 @@ services:
   eclair_dest:
     restart: unless-stopped
     stop_signal: SIGKILL
-    image: acinq/eclair:latest
+    image: acinq/eclair:release-0.8.0
     environment:
       JAVA_OPTS: |
         -Xmx256m