refactoring: remove inspect_edge

electrum/lnrouter.py

@@ -200,16 +200,32 @@ class LNPathFinder(Logger):
         nodes_to_explore = queue.PriorityQueue()
         nodes_to_explore.put((0, invoice_amount_msat, nodeB))  # order of fields (in tuple) matters!
 
-        def inspect_edge():
+
+        # main loop of search
+        while nodes_to_explore.qsize() > 0:
+            dist_to_edge_endnode, amount_msat, edge_endnode = nodes_to_explore.get()
+            if edge_endnode == nodeA:
+                break
+            if dist_to_edge_endnode != distance_from_start[edge_endnode]:
+                # queue.PriorityQueue does not implement decrease_priority,
+                # so instead of decreasing priorities, we add items again into the queue.
+                # so there are duplicates in the queue, that we discard now:
+                continue
+            for edge_channel_id in self.channel_db.get_channels_for_node(edge_endnode, my_channels=my_channels):
+                assert isinstance(edge_channel_id, bytes)
+                if edge_channel_id in self.blacklist:
+                    continue
+                channel_info = self.channel_db.get_channel_info(edge_channel_id, my_channels=my_channels)
+                edge_startnode = channel_info.node2_id if channel_info.node1_id == edge_endnode else channel_info.node1_id
                 is_mine = edge_channel_id in my_channels
                 if is_mine:
                     if edge_startnode == nodeA:  # payment outgoing, on our channel
                         if not my_channels[edge_channel_id].can_pay(amount_msat, check_frozen=True):
-                        return
+                            continue
                     else:  # payment incoming, on our channel. (funny business, cycle weirdness)
                         assert edge_endnode == nodeA, (bh2u(edge_startnode), bh2u(edge_endnode))
                         if not my_channels[edge_channel_id].can_receive(amount_msat, check_frozen=True):
-                        return
+                            continue
                 edge_cost, fee_for_edge_msat = self._edge_cost(
                     edge_channel_id,
                     start_node=edge_startnode,
@@ -225,24 +241,6 @@ class LNPathFinder(Logger):
                     amount_to_forward_msat = amount_msat + fee_for_edge_msat
                     nodes_to_explore.put((alt_dist_to_neighbour, amount_to_forward_msat, edge_startnode))
 
-        # main loop of search
-        while nodes_to_explore.qsize() > 0:
-            dist_to_edge_endnode, amount_msat, edge_endnode = nodes_to_explore.get()
-            if edge_endnode == nodeA:
-                break
-            if dist_to_edge_endnode != distance_from_start[edge_endnode]:
-                # queue.PriorityQueue does not implement decrease_priority,
-                # so instead of decreasing priorities, we add items again into the queue.
-                # so there are duplicates in the queue, that we discard now:
-                continue
-            for edge_channel_id in self.channel_db.get_channels_for_node(edge_endnode, my_channels=my_channels):
-                assert isinstance(edge_channel_id, bytes)
-                if edge_channel_id in self.blacklist:
-                    continue
-                channel_info = self.channel_db.get_channel_info(edge_channel_id, my_channels=my_channels)
-                edge_startnode = channel_info.node2_id if channel_info.node1_id == edge_endnode else channel_info.node1_id
-                inspect_edge()
-
         return prev_node
 
     @profiler