Merge pull request #262 from Elenpay/inactive-channels

Revive inactive channels
Elenpay · Aug 1, 2023 · c09324a · c09324a
2 parents 0df90a8 + 89e8a18
commit c09324a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Data/Repositories/NodeRepository.cs b/src/Data/Repositories/NodeRepository.cs
@@ -77,13 +77,13 @@ public async Task<Node> GetOrCreateByPubKey(string pubKey, ILightningService lig
                 var foundNode = await lightningService.GetNodeInfo(pubKey);
                 if (foundNode == null)
                 {
-                    throw new Exception("Node info not found");
+                    _logger.LogWarning("Peer with PubKey {pubKey} not found", pubKey);
                 }
 
                 node = new Node()
                 {
-                    Name = foundNode.Alias,
-                    PubKey = foundNode.PubKey,
+                    Name = foundNode?.Alias ?? "",
+                    PubKey = pubKey
                 };
                 var addNode = await AddAsync(node);
                 if (!addNode.Item1)

diff --git a/src/Jobs/ChannelMonitorJob.cs b/src/Jobs/ChannelMonitorJob.cs
@@ -76,7 +76,6 @@ public async Task Execute(IJobExecutionContext context)
 
             foreach (var channel in result?.Channels)
             {
-                if (!channel.Active) continue;
                 var node2 = await _nodeRepository.GetOrCreateByPubKey(channel.RemotePubkey, _lightningService);
 
                 // Recover Operations on channels
@@ -94,7 +93,7 @@ public async Task Execute(IJobExecutionContext context)
         _logger.LogInformation("{JobName} ended", nameof(ChannelMonitorJob));
     }
 
-    public async Task RecoverGhostChannels(Node source, Node destination, Channel? channel)
+    public async Task RecoverGhostChannels(Node source, Node destination, Channel channel)
     {
         if (!channel.Initiator && destination.IsManaged) return;
         try

diff --git a/test/NodeGuard.Tests/Data/Repositories/NodeRepositoryTests.cs b/test/NodeGuard.Tests/Data/Repositories/NodeRepositoryTests.cs
@@ -31,16 +31,17 @@ public async Task AddsNewNode_WhenRemoteNodeNotFound()
         var lightningServiceMock = new Mock<ILightningService>();
         var repositoryMock = new Mock<IRepository<Node>>();
 
+        var node = new LightningNode() { Alias = "TestAlias", PubKey = "TestPubKey" };
         lightningServiceMock.Setup(service => service.GetNodeInfo(It.IsAny<string>()))
-            .ReturnsAsync(new LightningNode() { Alias = "TestAlias", PubKey = "TestPubKey" });
+            .ReturnsAsync(node);
 
         repositoryMock.Setup(repository => repository.AddAsync(It.IsAny<Node>(), It.IsAny<ApplicationDbContext>()))
             .ReturnsAsync((true, null));
 
         var nodeRepository = new NodeRepository(repositoryMock.Object, null, dbContextFactory.Object, null);
 
         // Act
-        var result = await nodeRepository.GetOrCreateByPubKey("abc", lightningServiceMock.Object);
+        var result = await nodeRepository.GetOrCreateByPubKey(node.PubKey, lightningServiceMock.Object);
 
         // Assert
         result.Name.Should().Be("TestAlias");