lnworker: move buckets logic inside first branch of if statement (refactoring commit)

electrum/lnworker.py

@@ -1378,14 +1378,14 @@ class LNWallet(LNWorker):
                 self.logger.info(f"trying split configuration: {s[0].values()} rating: {s[1]}")
                 routes = []
                 try:
-                    buckets = defaultdict(list)
+                    if not self.channel_db:
-                    for chan_id, part_amount_msat in s[0].items():
+                        buckets = defaultdict(list)
-                        chan = self.channels[chan_id]
+                        for chan_id, part_amount_msat in s[0].items():
-                        if part_amount_msat:
+                            chan = self.channels[chan_id]
-                            buckets[chan.node_id].append((chan_id, part_amount_msat))
+                            if part_amount_msat:
-                    for node_id, bucket in buckets.items():
+                                buckets[chan.node_id].append((chan_id, part_amount_msat))
-                        bucket_amount_msat = sum([x[1] for x in bucket])
+                        for node_id, bucket in buckets.items():
-                        if not self.channel_db:
+                            bucket_amount_msat = sum([x[1] for x in bucket])
                             trampoline_onion, trampoline_fee, bucket_amount_with_fees, bucket_cltv_delta = create_trampoline_route_and_onion(
                                 amount_msat=amount_msat,
                                 bucket_amount_msat=bucket_amount_msat,
@@ -1425,8 +1425,9 @@ class LNWallet(LNWorker):
                             if trampoline_fee > 0:
                                 self.logger.info('not enough margin to pay trampoline fee')
                                 raise NoPathFound()
-                        else:
+                    else:
-                            for chan_id, part_amount_msat in bucket:
+                        for chan_id, part_amount_msat in s[0].items():
+                            if part_amount_msat:
                                 channel = self.channels[chan_id]
                                 route = self.create_route_for_payment(
                                     amount_msat=part_amount_msat,