now wired.

Author: rsafier

LNUnit.Tests/Abstract/EctdLightningAbstractTests.cs

@@ -4,6 +4,7 @@
 using Dasync.Collections;
 using Docker.DotNet;
 using dotnet_etcd;
+using Etcdserverpb;
 using Google.Protobuf;
 using Google.Protobuf.Collections;
 using Grpc.Core;
@@ -198,10 +199,12 @@ public async Task SetupNetwork(string lndImage = "lightninglabs/lnd", string lnd
             ], imageName: lndImage, tagName: lndTag, pullImage: false, acceptKeysend: true, mapTotmp: false,
             postgresDSN: _dbType == "postgres" ? PostgresFixture.LNDConnectionStrings["carol"] : null, lndkSupport: false, nativeSql: _dbType != "boltdb");
 
-        await Builder.Build(lndRoot: lndRoot, ectdEnabled:true);
+        await Builder.Build(lndRoot: lndRoot, ectdEnabled: true);
 
         await WaitNodesReady();
         await WaitGraphReady();
+
+        Assert.That(await CheckEctdRunning(), Is.True);
     }
 
     private async Task WaitNodesReady()
@@ -246,16 +249,17 @@ public async Task<bool> IsRunning()
         return false;
     }
 
-    [Test]
-    public async Task CheckEctdRunning()
+    [Test(ExpectedResult = true)]
+    public async Task<bool> CheckEctdRunning()
     {
         var inspect = await _client.Containers.InspectContainerAsync("etcd");
         Assert.IsTrue(inspect.State.Running, "Etcd running is not running");
-        var x = new EtcdClient("http://localhost:2379");
-        
-        
+        var etcdClient = new EtcdClient($"http://{inspect.NetworkSettings.IPAddress}:2379");
+        var status = await etcdClient.StatusAsync(new StatusRequest());
+        Assert.That(status.Version, Is.EqualTo("3.5.9"));
+        return true;
     }
-    
+
     [Test]
     [Timeout(2000)]
     [Category("Version")]
@@ -266,7 +270,7 @@ public async Task CheckLNDVersion()
         var info = n.LightningClient.GetInfo(new GetInfoRequest());
         info.Version.Print();
     }
- 
+
 
     private readonly MemoryCache _aliasCache = new(new MemoryCacheOptions { SizeLimit = 10000 });
     protected readonly string _dbType;
@@ -298,5 +302,5 @@ private async Task<string> ToAlias(LNDNodeConnection c, string remotePubkey)
         return alias;
     }
 
-    
+
 }

LNUnit/Setup/LNUnitBuilder.cs

@@ -112,30 +112,30 @@ public async Task Build(bool setupNetwork = false, string lndRoot = "/home/lnd/.
         //Setup network
         if (setupNetwork)
             Configuration.DockerNetworkId = await _dockerClient.BuildTestingNetwork(Configuration.BaseName);
-        
+
         if (ectdEnabled)
         {
-            
-// ## Option 5: Single-node development setup (simplest)
-//             services:
-//             etcd:
-//             image: quay.io/coreos/etcd:v3.5.9
-//             container_name: etcd-single
-//             environment:
-//             - ETCDCTL_API=3
-//             command:
-//             - etcd
-//                 - --advertise-client-urls=http://localhost:2379
-//             - --listen-client-urls=http://0.0.0.0:2379
-//             - --max-txn-ops=16384
-//                 - --max-request-bytes=104857600
-//             ports:
-//             - "2379:2379"
-//             volumes:
-//             - etcd-data:/default.etcd
+
+            // ## Option 5: Single-node development setup (simplest)
+            //             services:
+            //             etcd:
+            //             image: quay.io/coreos/etcd:v3.5.9
+            //             container_name: etcd-single
+            //             environment:
+            //             - ETCDCTL_API=3
+            //             command:
+            //             - etcd
+            //                 - --advertise-client-urls=http://localhost:2379
+            //             - --listen-client-urls=http://0.0.0.0:2379
+            //             - --max-txn-ops=16384
+            //                 - --max-request-bytes=104857600
+            //             ports:
+            //             - "2379:2379"
+            //             volumes:
+            //             - etcd-data:/default.etcd
             var ectdImageTag = new
             {
-                Image = @"gcr.io/etcd-development/etcd", 
+                Image = @"gcr.io/etcd-development/etcd",
                 Tag = "v3.5.9",
             };
             await _dockerClient.PullImageAndWaitForCompleted(ectdImageTag.Image, ectdImageTag.Tag);
@@ -147,15 +147,15 @@ public async Task Build(bool setupNetwork = false, string lndRoot = "/home/lnd/.
                     NetworkMode = $"{Configuration.DockerNetworkId}"
                 },
                 Name = "etcd",
-                Hostname ="etcd",
-                ExposedPorts =  new Dictionary<string, EmptyStruct>
+                Hostname = "etcd",
+                ExposedPorts = new Dictionary<string, EmptyStruct>
                 {
                     { "2379", new EmptyStruct() }
-                }, 
+                },
                 Env = new List<string>()
                 {
                     "ETCDCTL_API=3",
-                    "ETCD_NAME=etcd0", 
+                    "ETCD_NAME=etcd0",
                     "ETCD_DATA_DIR=/etcd-data",
                     "ETCD_ADVERTISE_CLIENT_URLS=http://etcd:2379",
                     "ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379",
@@ -165,12 +165,12 @@ public async Task Build(bool setupNetwork = false, string lndRoot = "/home/lnd/.
                     "ETCD_MAX_TXN_OPS=16384",
                     "ETCD_MAX_REQUEST_BYTES=104857600",
                 }
-                
+
             });
             var success =
                 await _dockerClient.Containers.StartContainerAsync(nodeContainer.ID, new ContainerStartParameters());
             await Task.Delay(500);
-            
+
         }
         //Setup BTC Nodes