revert -lnd changes based on comments

reverse LN_10.json sequence change

Author: macgyver13

docs/plugins.md

@@ -34,7 +34,7 @@ plugins:
   postDeploy:  # Plugins will run after all the `deploy` code has run.
     simln:
       entrypoint: "../plugins/simln"
-      activity: '[{"source": "tank-0003-lnd", "destination": "tank-0005-cln", "interval_secs": 1, "amount_msat": 2000}]'
+      activity: '[{"source": "tank-0003-ln", "destination": "tank-0005-ln", "interval_secs": 1, "amount_msat": 2000}]'
     hello:
       entrypoint: "../plugins/hello"
       podName: "hello-post-deploy"

resources/plugins/hello/README.md

@@ -62,7 +62,7 @@ nodes:
         - id:
             block: 300
             index: 1
-          target: tank-0004-lnd
+          target: tank-0004-ln
           capacity: 100000
           push_amt: 50000
 
@@ -76,7 +76,7 @@ nodes:
         - id:
             block: 300
             index: 2
-          target: tank-0005-lnd
+          target: tank-0005-ln
           capacity: 50000
           push_amt: 25000
 
@@ -99,7 +99,7 @@ plugins:  # Each plugin section has a number of hooks available (preDeploy, post
       helloTo: "postDeploy!"
     simln:  # You can have multiple plugins per hook
       entrypoint: "../../plugins/simln"
-      activity: '[{"source": "tank-0003-lnd", "destination": "tank-0005-lnd", "interval_secs": 1, "amount_msat": 2000}]'      
+      activity: '[{"source": "tank-0003-ln", "destination": "tank-0005-ln", "interval_secs": 1, "amount_msat": 2000}]'      
   preNode:  # preNode plugins run before each node is deployed
     hello:
       entrypoint: "../../plugins/hello"

resources/scenarios/commander.py

@@ -70,7 +70,10 @@
         )
 
     if pod.metadata.labels["mission"] == "lightning":
-        WARNET["lightning"].append(pod.metadata.name)
+        lnnode = LND(pod.metadata.name)
+        if "cln" in pod.metadata.labels["app.kubernetes.io/name"]:
+            lnnode = CLN(pod.metadata.name)
+        WARNET["lightning"].append(lnnode)
 
 for cm in cmaps.items:
     if not cm.metadata.labels or "channels" not in cm.metadata.labels:
@@ -225,11 +228,8 @@ def setup(self):
             self.tanks[tank["tank"]] = node
 
         for ln in WARNET["lightning"]:
-            # create the correct implementation based on pod name
-            if "-cln" in ln:
-                self.lns[ln] = CLN(ln, self.log)
-            else:
-                self.lns[ln] = LND(ln, self.log)
+            ln.setLogger(self.log)
+            self.lns[ln.name] = ln
 
         self.num_nodes = len(self.nodes)
 

resources/scenarios/ln_framework/ln.py

@@ -112,10 +112,13 @@ def to_lnd_chanpolicy(self, capacity):
 
 class LNNode(ABC):
     @abstractmethod
-    def __init__(self, pod_name, logger):
-        self.log = logger
+    def __init__(self, pod_name):
+        self.log = None
         self.name = pod_name
 
+    def setLogger(self, logger):
+        self.log = logger
+
     @staticmethod
     def param_dict_to_list(params: dict) -> list[str]:
         return [f"{k}={v}" for k, v in params.items()]
@@ -161,8 +164,8 @@ def update(self, txid_hex: str, policy: dict, capacity: int) -> dict:
 
 
 class CLN(LNNode):
-    def __init__(self, pod_name, logger):
-        super().__init__(pod_name, logger)
+    def __init__(self, pod_name):
+        super().__init__(pod_name)
         self.headers = {}
         self.impl = "cln"
 
@@ -326,8 +329,8 @@ def update(self, txid_hex: str, policy: dict, capacity: int, max_tries=2) -> dic
 
 
 class LND(LNNode):
-    def __init__(self, pod_name, logger):
-        super().__init__(pod_name, logger)
+    def __init__(self, pod_name):
+        super().__init__(pod_name)
         self.conn = http.client.HTTPSConnection(
             host=pod_name, port=8080, timeout=5, context=INSECURE_CONTEXT
         )

src/warnet/graph.py

@@ -269,7 +269,7 @@ def _import_network(graph_file_path, output_path):
         source = pk_to_tank[edge["node1_pub"]]
         channel = {
             "id": {"block": block, "index": index},
-            "target": pk_to_tank[edge["node2_pub"]] + "-lnd",
+            "target": pk_to_tank[edge["node2_pub"]] + "-ln",
             "capacity": int(edge["capacity"]),
             "push_amt": int(edge["capacity"]) // 2,
             "source_policy": Policy.from_lnd_describegraph(edge["node1_policy"]).to_dict(),

test/data/LN_10.json

@@ -987,7 +987,7 @@
         {
             "node1_pub": "02b705ad9fff5b30e69dd3810d100372332c1a750db5a50edf7353c77ab486643e",
             "node2_pub": "037659a0ac8eb3b8d0a720114efc861d3a940382dcfa1403746b4f8f6b2e8810ba",
-            "channel_id": "908655100992880641",
+            "channel_id": "891818279431438336",
             "chan_point": "316bc4974bc4382554b80ba30eaaecf18c3f45f03fed41f99e9600d1c5dd3029:0",
             "last_update": 1710800025,
             "capacity": "2000000",
@@ -1016,7 +1016,7 @@
         {
             "node1_pub": "02b705ad9fff5b30e69dd3810d100372332c1a750db5a50edf7353c77ab486643e",
             "node2_pub": "03864ef025fde8fb587d989186ce6a4a186895ee44a926bfc370e2c366597a3f8f",
-            "channel_id": "891818279431438336",
+            "channel_id": "908655100992880641",
             "chan_point": "0acfd2470db4eb06268b3f22b4c45c0fdcc11d10b6519577662e54823a0f264e:1",
             "last_update": 1710841427,
             "capacity": "10000000",

test/data/ln/network.yaml

@@ -18,7 +18,7 @@ nodes:
         - id:
             block: 300
             index: 1
-          target: tank-0004-lnd
+          target: tank-0004-ln
           capacity: 100000
           push_amt: 50000
   - name: tank-0004
@@ -29,7 +29,7 @@ nodes:
         - id:
             block: 300
             index: 2
-          target: tank-0005-lnd
+          target: tank-0005-ln
           capacity: 50000
           push_amt: 25000
   - name: tank-0005

test/data/ln_mixed/network.yaml

@@ -9,7 +9,7 @@ nodes:
         - id:
             block: 300
             index: 4
-          target: tank-0003-lnd
+          target: tank-0003-ln
           capacity: 50001
           push_amt: 25003
   - name: tank-0002
@@ -22,7 +22,7 @@ nodes:
         - id:
             block: 300
             index: 5
-          target: tank-0001-cln
+          target: tank-0001-ln
           capacity: 50002
           push_amt: 25001
   - name: tank-0003
@@ -35,7 +35,7 @@ nodes:
         - id:
             block: 300
             index: 1
-          target: tank-0004-lnd
+          target: tank-0004-ln
           capacity: 100003
           push_amt: 50004
   - name: tank-0004
@@ -48,7 +48,7 @@ nodes:
         - id:
             block: 300
             index: 2
-          target: tank-0005-lnd
+          target: tank-0005-ln
           capacity: 50004
           push_amt: 25005
   - name: tank-0005
@@ -61,6 +61,6 @@ nodes:
         - id:
             block: 300
             index: 3
-          target: tank-0002-cln
+          target: tank-0002-ln
           capacity: 100005
           push_amt: 50002

test/ln_mixed_test.py

@@ -17,11 +17,11 @@ def __init__(self):
         self.network_dir = Path(os.path.dirname(__file__)) / "data" / "ln_mixed"
         self.scen_dir = Path(os.path.dirname(__file__)).parent / "resources" / "scenarios"
         self.lns = [
-            CLN("tank-0001-cln", self.log),
-            CLN("tank-0002-cln", self.log),
-            LND("tank-0003-lnd", self.log),
-            LND("tank-0004-lnd", self.log),
-            LND("tank-0005-lnd", self.log),
+            CLN("tank-0001-ln"),
+            CLN("tank-0002-ln"),
+            LND("tank-0003-ln"),
+            LND("tank-0004-ln"),
+            LND("tank-0005-ln"),
         ]
 
     def node(self, name: str) -> LNNode:
@@ -39,15 +39,15 @@ def run_test(self):
                 f"{self.lns[0]} has does not have a wallet balance"
             )
             # Send a payment across channels opened automatically by ln_init
-            self.pay_invoice_rpc(sender="tank-0003-lnd", recipient="tank-0001-cln")
-            # self.pay_invoice_node(sender="tank-0001-cln", recipient="tank-0003-lnd")
+            self.pay_invoice_rpc(sender="tank-0003-ln", recipient="tank-0001-ln")
+            # self.pay_invoice_node(sender="tank-0001-ln", recipient="tank-0003-ln")
 
             # Manually open more channels between first three nodes
             # and send a payment using warnet RPC
             self.manual_open_channels()
             # FIXME: need to decide how to interact with LND via REST outside cluster
             # self.wait_for_gossip_sync(self.lns, 5)
-            # self.pay_invoice(sender="tank-0004-lnd", recipient="tank-0002-cln")
+            # self.pay_invoice(sender="tank-0004-ln", recipient="tank-0002-ln")
 
         finally:
             self.cleanup()
@@ -63,13 +63,13 @@ def wait_for_txs(self, count):
 
     def manual_open_channels(self):
         # 1 -> 4
-        pk1 = self.warnet("ln pubkey tank-0004-lnd")  # prefer -> self.node("tank-0004-lnd").uri()
-        channel = self.node("tank-0001-cln").channel(pk1, 444444, 200000, 5000)
+        pk1 = self.warnet("ln pubkey tank-0004-ln")  # prefer -> self.node("tank-0004-ln").uri()
+        channel = self.node("tank-0001-ln").channel(pk1, 444444, 200000, 5000)
         assert "txid" in channel, "Failed to create channel between CLN and LND"
         self.log.info(f"Channel txid {channel['txid']}")
 
         # 4 -> 2
-        # channel = self.node("tank-0004-lnd").channel(
+        # channel = self.node("tank-0004-ln").channel(
         #     self.lns[1].uri(), 333333, 150000, 5000
         # )
         # assert "txid" in channel, "Failed to create channel between LND and CLN"

test/ln_test.py

@@ -43,7 +43,7 @@ def test_channel_policies(self):
         self.log.info("Ensuring node-level channel policy settings")
         graphs = []
         for n in range(10):
-            ln = f"tank-{n:04d}-lnd"
+            ln = f"tank-{n:04d}-ln"
             res = self.warnet(f"ln rpc {ln} describegraph")
             graphs.append(json.loads(res)["edges"])
 
@@ -73,8 +73,8 @@ def check_policy(node: int, index: int, field: str, values: tuple):
 
     def test_payments(self):
         def get_and_pay(src, tgt):
-            src = f"tank-{src:04d}-lnd"
-            tgt = f"tank-{tgt:04d}-lnd"
+            src = f"tank-{src:04d}-ln"
+            tgt = f"tank-{tgt:04d}-ln"
             invoice = json.loads(self.warnet(f"ln rpc {tgt} addinvoice --amt 230118"))[
                 "payment_request"
             ]