lint

Author: pinheadmz

resources/scenarios/ln_framework/ln.py

@@ -380,12 +380,8 @@ def channel(self, pk, capacity, push_amt, fee_rate):
         res = json.loads(response)
         if "result" not in res:
             raise Exception(res)
-        res["txid"] = self.b64_to_hex(
-            res["result"]["chan_pending"]["txid"], reverse=True
-        )
-        res["outpoint"] = (
-            f"{res['txid']}:{res['result']['chan_pending']['output_index']}"
-        )
+        res["txid"] = self.b64_to_hex(res["result"]["chan_pending"]["txid"], reverse=True)
+        res["outpoint"] = f"{res['txid']}:{res['result']['chan_pending']['output_index']}"
         return res
 
     def update(self, txid_hex: str, policy: dict, capacity: int):

resources/scenarios/ln_init.py

@@ -5,18 +5,18 @@
 
 from commander import Commander
 from ln_framework.ln import (
-    Policy,
     CHANNEL_OPEN_START_HEIGHT,
     CHANNEL_OPENS_PER_BLOCK,
+    FEE_RATE_DECREMENT,
     MAX_FEE_RATE,
-    FEE_RATE_DECREMENT
+    Policy,
 )
+from test_framework.address import address_to_scriptpubkey
 from test_framework.messages import (
     COIN,
     CTransaction,
     CTxOut,
 )
-from test_framework.address import address_to_scriptpubkey
 
 
 class LNInit(Commander):
@@ -105,7 +105,7 @@ def get_ln_addr(self, ln):
             sat_amt = 10 * COIN
             helicopter.vout.append(CTxOut(sat_amt, address_to_scriptpubkey(addr)))
         rawtx = miner.fundrawtransaction(helicopter.serialize().hex())
-        signed_tx = miner.signrawtransactionwithwallet(rawtx['hex'])['hex']
+        signed_tx = miner.signrawtransactionwithwallet(rawtx["hex"])["hex"]
         txid = miner.sendrawtransaction(signed_tx)
         # confirm funds in last block before channel opens
         gen(1)
@@ -133,11 +133,14 @@ def confirm_ln_balance(self, ln_name):
                         self.log.info(f"Got 0 balance from {ln_name} retrying in 5 seconds...")
                         sleep(5)
                 except Exception as e:
-                    self.log.info(f"Couldn't get balance from {ln_name} because {e}, retrying in 5 seconds...")
+                    self.log.info(
+                        f"Couldn't get balance from {ln_name} because {e}, retrying in 5 seconds..."
+                    )
                     sleep(5)
 
         fund_threads = [
-            threading.Thread(target=confirm_ln_balance, args=(self, ln_name)) for ln_name in channel_openers
+            threading.Thread(target=confirm_ln_balance, args=(self, ln_name))
+            for ln_name in channel_openers
         ]
         for thread in fund_threads:
             thread.start()
@@ -159,7 +162,9 @@ def get_ln_uri(self, ln):
                     self.log.info(f"LN node {ln.name} has URI {uri}")
                     break
                 except Exception as e:
-                    self.log.info(f"Couldn't get URI from {ln.name} because {e}, retrying in 5 seconds...")
+                    self.log.info(
+                        f"Couldn't get URI from {ln.name} because {e}, retrying in 5 seconds..."
+                    )
                     sleep(5)
 
         uri_threads = [
@@ -212,7 +217,9 @@ def connect_ln(self, pair):
                         else:
                             raise Exception(res)
                 except Exception as e:
-                    self.log.info(f"Couldn't connect {pair[0].name} -> {pair[1].name} because {e}, retrying in 5 seconds...")
+                    self.log.info(
+                        f"Couldn't connect {pair[0].name} -> {pair[1].name} because {e}, retrying in 5 seconds..."
+                    )
                     sleep(5)
 
         p2p_threads = [
@@ -268,15 +275,21 @@ def open_channel(self, ch, fee_rate):
                         )
                         ch["txid"] = res["txid"]
                         ch["outpoint"] = res["outpoint"]
-                        self.log.info(f"Channel open success:\n{log}\n  outpoint: {res['outpoint']}")
+                        self.log.info(
+                            f"Channel open success:\n{log}\n  outpoint: {res['outpoint']}"
+                        )
                         break
                     except Exception as e:
-                        self.log.info(f"Couldn't open channel:\n{log}\n  {e}\n  Retrying in 5 seconds...")
+                        self.log.info(
+                            f"Couldn't open channel:\n{log}\n  {e}\n  Retrying in 5 seconds..."
+                        )
                         sleep(5)
 
             channels = sorted(ch_by_block[target_block], key=lambda ch: ch["id"]["index"])
             if len(channels) > CHANNEL_OPENS_PER_BLOCK:
-                raise Exception(f"Too many channels in block {target_block}: {len(channels)} / Maximum: {CHANNEL_OPENS_PER_BLOCK}")
+                raise Exception(
+                    f"Too many channels in block {target_block}: {len(channels)} / Maximum: {CHANNEL_OPENS_PER_BLOCK}"
+                )
             index = 0
             fee_rate = MAX_FEE_RATE
             ch_threads = []
@@ -335,7 +348,9 @@ def ln_all_chs(self, ln):
                         )
                         sleep(5)
                 except Exception as e:
-                    self.log.info(f"Couldn't check graph from {ln.name} because {e}, retrying in 5 seconds...")
+                    self.log.info(
+                        f"Couldn't check graph from {ln.name} because {e}, retrying in 5 seconds..."
+                    )
                     sleep(5)
 
         ch_ann_threads = [
@@ -367,7 +382,9 @@ def update_policy(self, ln, txid_hex, policy, capacity):
                         continue
                     break
                 except Exception as e:
-                    self.log.info(f"Couldn't update channel policy for {ln.name} because {e}, retrying in 5 seconds...")
+                    self.log.info(
+                        f"Couldn't update channel policy for {ln.name} because {e}, retrying in 5 seconds..."
+                    )
                     sleep(5)
 
         update_threads = []
@@ -416,7 +433,9 @@ def matching_graph(self, expected, ln):
                 try:
                     actual = ln.graph()["edges"]
                 except Exception as e:
-                    self.log.info(f"Couldn't get graph from {ln.name} because {e}, retrying in 5 seconds...")
+                    self.log.info(
+                        f"Couldn't get graph from {ln.name} because {e}, retrying in 5 seconds..."
+                    )
                     sleep(5)
                     continue
 

src/warnet/graph.py

@@ -12,9 +12,9 @@
 from rich.table import Table
 
 from resources.scenarios.ln_framework.ln import (
-    Policy,
     CHANNEL_OPEN_START_HEIGHT,
-    CHANNEL_OPENS_PER_BLOCK
+    CHANNEL_OPENS_PER_BLOCK,
+    Policy,
 )
 
 from .constants import (

test/ln_basic_test.py

@@ -58,7 +58,8 @@ def fund_wallets(self):
             addr = json.loads(self.warnet(f"ln rpc {ln} newaddress p2wkh"))["address"]
             self.warnet(f"bitcoin rpc tank-0000 sendtoaddress {addr} 10")
         self.wait_for_predicate(
-            lambda: json.loads(self.warnet("bitcoin rpc tank-0000 getmempoolinfo"))["size"] == len(self.lns)
+            lambda: json.loads(self.warnet("bitcoin rpc tank-0000 getmempoolinfo"))["size"]
+            == len(self.lns)
         )
         self.warnet("bitcoin rpc tank-0000 -generate 1")