ConfigureAwait(false) all over the place, few other minor things. (#9)

rsafier · web-flow · commit 6990d97a2dac · 2025-11-15T09:02:42.000-05:00
* .ConfigureAwait(false) all over the place, few other minor things.

* lnd 0.20 image.

* wip

* format.
diff --git a/LNUnit.LND/LNDChannelAcceptor.cs b/LNUnit.LND/LNDChannelAcceptor.cs
@@ -49,11 +49,12 @@ private async Task AttachInterceptor()
             using (var channelAcceptor = Node.LightningClient.ChannelAcceptor())
             {
                 Running = true;
-                while (await channelAcceptor.ResponseStream.MoveNext(_cancellationTokenSource.Token))
+                while (await channelAcceptor.ResponseStream.MoveNext(_cancellationTokenSource.Token)
+                           .ConfigureAwait(false))
                 {
                     var message = channelAcceptor.ResponseStream.Current;
                     var result = OnChannelRequest(message);
-                    await channelAcceptor.RequestStream.WriteAsync(await result);
+                    await channelAcceptor.RequestStream.WriteAsync(await result).ConfigureAwait(false);
                 }
             }
         }
diff --git a/LNUnit.LND/LNDChannelInterceptorHandler.cs b/LNUnit.LND/LNDChannelInterceptorHandler.cs
@@ -18,11 +18,12 @@ private async Task ListenFromChannelAccept()
     {
         using (var streamingEvents = Node.LightningClient.ChannelAcceptor())
         {
-            while (await streamingEvents.ResponseStream.MoveNext())
+            while (await streamingEvents.ResponseStream.MoveNext().ConfigureAwait(false))
             {
                 var channelRequest = streamingEvents.ResponseStream.Current;
                 var response = OnChannelRequest?.Invoke(channelRequest);
-                if (response != null) await streamingEvents.RequestStream.WriteAsync(await response);
+                if (response != null)
+                    await streamingEvents.RequestStream.WriteAsync(await response).ConfigureAwait(false);
             }
         }
     }
diff --git a/LNUnit.LND/LNDCustomMessageHandler.cs b/LNUnit.LND/LNDCustomMessageHandler.cs
@@ -21,14 +21,14 @@ public async Task<SendCustomMessageResponse> SendCustomMessageRequest(CustomMess
             Data = m.Data,
             Peer = m.Peer,
             Type = m.Type
-        });
+        }).ConfigureAwait(false);
     }
 
     private async Task ListenForCustomMessages()
     {
         using (var streamingEvents = Node.LightningClient.SubscribeCustomMessages(new SubscribeCustomMessagesRequest()))
         {
-            while (await streamingEvents.ResponseStream.MoveNext())
+            while (await streamingEvents.ResponseStream.MoveNext().ConfigureAwait(false))
             {
                 var message = streamingEvents.ResponseStream.Current;
                 OnMessage?.Invoke(Node, message);
diff --git a/LNUnit.LND/LNDNodeConnection.cs b/LNUnit.LND/LNDNodeConnection.cs
@@ -196,7 +196,8 @@ public Task Stop()
                 ByteString.CopyFrom(Encoding.Default.GetBytes(message))); //message type
         var streamingCallResponse = RouterClient.SendPaymentV2(payment);
         Payment? paymentResponse = null;
-        await foreach (var res in streamingCallResponse.ResponseStream.ReadAllAsync()) paymentResponse = res;
+        await foreach (var res in streamingCallResponse.ResponseStream.ReadAllAsync().ConfigureAwait(false))
+            paymentResponse = res;
         return paymentResponse;
     }
 
diff --git a/LNUnit.LND/LNDNodePool.cs b/LNUnit.LND/LNDNodePool.cs
@@ -135,13 +135,13 @@ private void SetupTimers()
         _rpcCheckTimer = _quickStartupMode
             ? new PeriodicTimer(TimeSpan.FromMilliseconds(100))
             : new PeriodicTimer(_updateReadyStatesPeriod);
-        Task.Run(async () => await UpdateReadyStates(), _cancellationTokenSource.Token);
+        Task.Run(async () => await UpdateReadyStates().ConfigureAwait(false), _cancellationTokenSource.Token);
         _logger?.LogDebug("UpdateReadyStates: Task Started.");
     }
 
     private async Task UpdateReadyStates() //TIMER
     {
-        while (await _rpcCheckTimer!.WaitForNextTickAsync(_cancellationTokenSource.Token))
+        while (await _rpcCheckTimer!.WaitForNextTickAsync(_cancellationTokenSource.Token).ConfigureAwait(false))
         {
             _logger?.LogDebug("UpdateReadyStates: Starting. Quick: {QuickMode}", _quickStartupMode);
             SetupNotYetInitializedNodes();
@@ -228,13 +228,13 @@ public async Task<PoolRebalanceStats> RebalanceNodePool(int deltaThreshold = 100
         //Get all channels across pool
         //Filter for all cross-links
         //select origin from all with >50% balance
-        var rebalanceTasks = await GetInteralNodeEvenBalaceTasks(this, deltaThreshold);
+        var rebalanceTasks = await GetInteralNodeEvenBalaceTasks(this, deltaThreshold).ConfigureAwait(false);
         var stats = new PoolRebalanceStats();
         foreach (var t in rebalanceTasks)
         {
             var src = ReadyNodes.First(x => x.LocalNodePubKey == t.SrcPk);
             var dest = ReadyNodes.First(x => x.LocalNodePubKey == t.DestPk);
-            var paymentHash = await InvoicePayRebalance(src, dest, t.Amount, _logger, t.ChanId);
+            var paymentHash = await InvoicePayRebalance(src, dest, t.Amount, _logger, t.ChanId).ConfigureAwait(false);
             if (!paymentHash.IsNullOrEmpty())
             {
                 //update stats
@@ -243,7 +243,7 @@ public async Task<PoolRebalanceStats> RebalanceNodePool(int deltaThreshold = 100
                 //Updated PaymentHash info
                 t.PaymentHash = Convert.FromHexString(paymentHash!);
                 //write to db
-                if (SaveRebalanceAction != null) await SaveRebalanceAction(t);
+                if (SaveRebalanceAction != null) await SaveRebalanceAction(t).ConfigureAwait(false);
                 stats.Tasks.Add(t);
             }
         }
@@ -276,7 +276,7 @@ public async Task<PoolRebalanceStats> RebalanceNodePool(int deltaThreshold = 100
                 Value = valueInSataoshis,
                 Memo = "InvoicePayRebalance",
                 Expiry = 60 //1 minute
-            });
+            }).ConfigureAwait(false);
             logger?.LogDebug("InvoicePayRebalance: {PaymentRequest} for {Value} sats from {Source}",
                 invoice.PaymentRequest, valueInSataoshis, src.LocalAlias);
 
@@ -288,7 +288,7 @@ public async Task<PoolRebalanceStats> RebalanceNodePool(int deltaThreshold = 100
             };
             if (channelId != 0) payment.OutgoingChanIds.Add(channelId);
             var streamingCallResponse = src.RouterClient.SendPaymentV2(payment);
-            await streamingCallResponse.ResponseStream.MoveNext();
+            await streamingCallResponse.ResponseStream.MoveNext().ConfigureAwait(false);
             // var response = streamingCallResponse.ResponseStream.Current.Status == Payment.Types.PaymentStatus.Succeeded;
             logger?.LogDebug(
                 "InvoicePayRebalance: {PaymentRequest} for {Value} sats from {Source} paid by {PaymentHash}",
@@ -322,7 +322,7 @@ public static async Task<List<BalanceTask>> GetInteralNodeEvenBalaceTasks(LNDNod
             {
                 ActiveOnly = true,
                 PeerAliasLookup = false
-            });
+            }).ConfigureAwait(false);
             //Filter to channels with internal pool peers
             var poolPeerChannels =
                 activeChannels.Channels.Where(x => ourPoolMemberPKs.Contains(x.RemotePubkey)).ToList();
diff --git a/LNUnit.LND/LNDStateMonitor.cs b/LNUnit.LND/LNDStateMonitor.cs
@@ -31,7 +31,7 @@ private async Task SubscribeHtlcEventStream()
             using (var streamingEvents = Node.StateClient.SubscribeState(new SubscribeStateRequest()))
             {
                 Running = true;
-                while (await streamingEvents.ResponseStream.MoveNext())
+                while (await streamingEvents.ResponseStream.MoveNext().ConfigureAwait(false))
                 {
                     var state = streamingEvents.ResponseStream.Current;
                     OnStateChange?.Invoke(state);
diff --git a/LNUnit.LND/LndHtlcMonitor.cs b/LNUnit.LND/LndHtlcMonitor.cs
@@ -31,7 +31,7 @@ private async Task SubscribeHtlcEventStream()
             using (var streamingEvents = Node.RouterClient.SubscribeHtlcEvents(new SubscribeHtlcEventsRequest()))
             {
                 Running = true;
-                while (await streamingEvents.ResponseStream.MoveNext())
+                while (await streamingEvents.ResponseStream.MoveNext().ConfigureAwait(false))
                 {
                     var htlcEvent = streamingEvents.ResponseStream.Current;
                     OnHtlcEvent(htlcEvent);
diff --git a/LNUnit.Tests/AbcLightningFixtureSqlite.cs b/LNUnit.Tests/AbcLightningFixtureSqlite.cs
@@ -5,8 +5,8 @@
 namespace LNUnit.Tests;
 
 //[Ignore("only local")]
-[TestFixture("sqlite", "custom_lnd", "latest", "/home/lnd/.lnd", false)]
-//[TestFixture("sqlite", "lightninglabs/lnd", "v0.19.3-beta", "/root/.lnd", true)]
+//[TestFixture("sqlite", "custom_lnd", "latest", "/home/lnd/.lnd", false)]
+[TestFixture("sqlite", "lightninglabs/lnd", "v0.20.0-beta", "/root/.lnd", true)]
 public class AbcLightningAbstractTestsSqlite : AbcLightningAbstractTests
 {
     public AbcLightningAbstractTestsSqlite(string dbType = "sqlite",
diff --git a/LNUnit.Tests/DockerTest.cs b/LNUnit.Tests/DockerTest.cs
@@ -4,6 +4,7 @@
 
 namespace LNUnit.Tests.Abstract;
 
+[Ignore("only local")]
 public class DockerTest
 {
     private readonly DockerClient _client = new DockerClientConfiguration().CreateClient();
diff --git a/LNUnit/Setup/DockerHelper.cs b/LNUnit/Setup/DockerHelper.cs
@@ -37,18 +37,18 @@ await client.Images.CreateImageAsync(
             //     Password = "pa$$w0rd"
             // },
             null,
-            p);
+            p).ConfigureAwait(false);
 
         while (!done)
-            await Task.Delay(1);
+            await Task.Delay(50).ConfigureAwait(false);
     }
 
     public static async Task RemoveContainer(this DockerClient client, string name, bool removeLinks = false)
     {
         try
         {
             await client.Containers.StopContainerAsync(name,
-                new ContainerStopParameters { WaitBeforeKillSeconds = 0 });
+                new ContainerStopParameters { WaitBeforeKillSeconds = 0 }).ConfigureAwait(false);
         }
         catch (Exception e)
         {
@@ -58,7 +58,8 @@ await client.Containers.StopContainerAsync(name,
         try
         {
             await client.Containers.RemoveContainerAsync(name,
-                new ContainerRemoveParameters { Force = true, RemoveVolumes = true, RemoveLinks = removeLinks });
+                    new ContainerRemoveParameters { Force = true, RemoveVolumes = true, RemoveLinks = removeLinks })
+                .ConfigureAwait(false);
         }
         catch (Exception e)
         {
@@ -86,7 +87,7 @@ public static async Task<string> BuildTestingNetwork(this DockerClient client, s
             Name = $"{baseName}_{randomString}",
             Driver = "bridge",
             CheckDuplicate = true
-        });
+        }).ConfigureAwait(false);
         return networksCreateResponse.ID;
     }
 
@@ -97,7 +98,7 @@ public static async Task CreateDockerImageFromPath(this DockerClient client, str
         await client.Images.BuildImageFromDockerfileAsync(new ImageBuildParameters
         {
             Tags = tags
-        }, tarStream, null, null, p);
+        }, tarStream, null, null, p).ConfigureAwait(false);
     }
 
     public static MemoryStream MakeDockerTarFromFolder(this string path)
diff --git a/LNUnit/Setup/LNUnitBuilder.cs b/LNUnit/Setup/LNUnitBuilder.cs

Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,12 @@ private async Task AttachInterceptor()`
`49`	`49`	`using (var channelAcceptor = Node.LightningClient.ChannelAcceptor())`
`50`	`50`	`{`
`51`	`51`	`Running = true;`
`52`		`- while (await channelAcceptor.ResponseStream.MoveNext(_cancellationTokenSource.Token))`
	`52`	`+ while (await channelAcceptor.ResponseStream.MoveNext(_cancellationTokenSource.Token)`
	`53`	`+ .ConfigureAwait(false))`
`53`	`54`	`{`
`54`	`55`	`var message = channelAcceptor.ResponseStream.Current;`
`55`	`56`	`var result = OnChannelRequest(message);`
`56`		`- await channelAcceptor.RequestStream.WriteAsync(await result);`
	`57`	`+ await channelAcceptor.RequestStream.WriteAsync(await result).ConfigureAwait(false);`
`57`	`58`	`}`
`58`	`59`	`}`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,12 @@ private async Task ListenFromChannelAccept()`
`18`	`18`	`{`
`19`	`19`	`using (var streamingEvents = Node.LightningClient.ChannelAcceptor())`
`20`	`20`	`{`
`21`		`- while (await streamingEvents.ResponseStream.MoveNext())`
	`21`	`+ while (await streamingEvents.ResponseStream.MoveNext().ConfigureAwait(false))`
`22`	`22`	`{`
`23`	`23`	`var channelRequest = streamingEvents.ResponseStream.Current;`
`24`	`24`	`var response = OnChannelRequest?.Invoke(channelRequest);`
`25`		`- if (response != null) await streamingEvents.RequestStream.WriteAsync(await response);`
	`25`	`+ if (response != null)`
	`26`	`+ await streamingEvents.RequestStream.WriteAsync(await response).ConfigureAwait(false);`
`26`	`27`	`}`
`27`	`28`	`}`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,14 @@ public async Task<SendCustomMessageResponse> SendCustomMessageRequest(CustomMess`
`21`	`21`	`Data = m.Data,`
`22`	`22`	`Peer = m.Peer,`
`23`	`23`	`Type = m.Type`
`24`		`- });`
	`24`	`+ }).ConfigureAwait(false);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`private async Task ListenForCustomMessages()`
`28`	`28`	`{`
`29`	`29`	`using (var streamingEvents = Node.LightningClient.SubscribeCustomMessages(new SubscribeCustomMessagesRequest()))`
`30`	`30`	`{`
`31`		`- while (await streamingEvents.ResponseStream.MoveNext())`
	`31`	`+ while (await streamingEvents.ResponseStream.MoveNext().ConfigureAwait(false))`
`32`	`32`	`{`
`33`	`33`	`var message = streamingEvents.ResponseStream.Current;`
`34`	`34`	`OnMessage?.Invoke(Node, message);`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,8 @@ public Task Stop()`
`196`	`196`	`ByteString.CopyFrom(Encoding.Default.GetBytes(message))); //message type`
`197`	`197`	`var streamingCallResponse = RouterClient.SendPaymentV2(payment);`
`198`	`198`	`Payment? paymentResponse = null;`
`199`		`- await foreach (var res in streamingCallResponse.ResponseStream.ReadAllAsync()) paymentResponse = res;`
	`199`	`+ await foreach (var res in streamingCallResponse.ResponseStream.ReadAllAsync().ConfigureAwait(false))`
	`200`	`+ paymentResponse = res;`
`200`	`201`	`return paymentResponse;`
`201`	`202`	`}`
`202`	`203`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ private async Task SubscribeHtlcEventStream()`
`31`	`31`	`using (var streamingEvents = Node.StateClient.SubscribeState(new SubscribeStateRequest()))`
`32`	`32`	`{`
`33`	`33`	`Running = true;`
`34`		`- while (await streamingEvents.ResponseStream.MoveNext())`
	`34`	`+ while (await streamingEvents.ResponseStream.MoveNext().ConfigureAwait(false))`
`35`	`35`	`{`
`36`	`36`	`var state = streamingEvents.ResponseStream.Current;`
`37`	`37`	`OnStateChange?.Invoke(state);`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace LNUnit.Tests.Abstract;`
`6`	`6`
	`7`	`+[Ignore("only local")]`
`7`	`8`	`public class DockerTest`
`8`	`9`	`{`
`9`	`10`	`private readonly DockerClient _client = new DockerClientConfiguration().CreateClient();`
Original file line number	Diff line number	Diff line change
`@@ -37,18 +37,18 @@ await client.Images.CreateImageAsync(`
`37`	`37`	`// Password = "pa$$w0rd"`
`38`	`38`	`// },`
`39`	`39`	`null,`
`40`		`- p);`
	`40`	`+ p).ConfigureAwait(false);`
`41`	`41`
`42`	`42`	`while (!done)`
`43`		`- await Task.Delay(1);`
	`43`	`+ await Task.Delay(50).ConfigureAwait(false);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public static async Task RemoveContainer(this DockerClient client, string name, bool removeLinks = false)`
`47`	`47`	`{`
`48`	`48`	`try`
`49`	`49`	`{`
`50`	`50`	`await client.Containers.StopContainerAsync(name,`
`51`		`- new ContainerStopParameters { WaitBeforeKillSeconds = 0 });`
	`51`	`+ new ContainerStopParameters { WaitBeforeKillSeconds = 0 }).ConfigureAwait(false);`
`52`	`52`	`}`
`53`	`53`	`catch (Exception e)`
`54`	`54`	`{`
`@@ -58,7 +58,8 @@ await client.Containers.StopContainerAsync(name,`
`58`	`58`	`try`
`59`	`59`	`{`
`60`	`60`	`await client.Containers.RemoveContainerAsync(name,`
`61`		`- new ContainerRemoveParameters { Force = true, RemoveVolumes = true, RemoveLinks = removeLinks });`
	`61`	`+ new ContainerRemoveParameters { Force = true, RemoveVolumes = true, RemoveLinks = removeLinks })`
	`62`	`+ .ConfigureAwait(false);`
`62`	`63`	`}`
`63`	`64`	`catch (Exception e)`
`64`	`65`	`{`
`@@ -86,7 +87,7 @@ public static async Task<string> BuildTestingNetwork(this DockerClient client, s`
`86`	`87`	`Name = $"{baseName}_{randomString}",`
`87`	`88`	`Driver = "bridge",`
`88`	`89`	`CheckDuplicate = true`
`89`		`- });`
	`90`	`+ }).ConfigureAwait(false);`
`90`	`91`	`return networksCreateResponse.ID;`
`91`	`92`	`}`
`92`	`93`
`@@ -97,7 +98,7 @@ public static async Task CreateDockerImageFromPath(this DockerClient client, str`
`97`	`98`	`await client.Images.BuildImageFromDockerfileAsync(new ImageBuildParameters`
`98`	`99`	`{`
`99`	`100`	`Tags = tags`
`100`		`- }, tarStream, null, null, p);`
	`101`	`+ }, tarStream, null, null, p).ConfigureAwait(false);`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`public static MemoryStream MakeDockerTarFromFolder(this string path)`