test: import graph

Author: pinheadmz

src/warnet/server.py

@@ -573,14 +573,14 @@ def graph_import(
                 srcp += f" --base_fee_msat={channel['node1_policy']['fee_base_msat']}"
                 srcp += f" --fee_rate_ppm={channel['node1_policy']['fee_rate_milli_msat']}"
                 srcp += f" --time_lock_delta={channel['node1_policy']['time_lock_delta']}"
-                srcp += f" --max_htlc_msat={channel['node1_policy']['max_htlc_msat']}"
                 srcp += f" --min_htlc_msat={channel['node1_policy']['min_htlc']}"
+                srcp += f" --max_htlc_msat={push * 1000}"
             if channel["node2_policy"]:
                 tgtp += f" --base_fee_msat={channel['node2_policy']['fee_base_msat']}"
                 tgtp += f" --fee_rate_ppm={channel['node2_policy']['fee_rate_milli_msat']}"
                 tgtp += f" --time_lock_delta={channel['node2_policy']['time_lock_delta']}"
-                tgtp += f" --max_htlc_msat={channel['node2_policy']['max_htlc_msat']}"
                 tgtp += f" --min_htlc_msat={channel['node2_policy']['min_htlc']}"
+                tgtp += f" --max_htlc_msat={push * 1000}"
 
             graph.add_edge(
                 src,

src/warnet/utils.py

@@ -489,9 +489,10 @@ def policy_match(pol1, pol2):
     return (
         pol1["time_lock_delta"] == pol2["time_lock_delta"]
         and pol1["min_htlc"] == pol2["min_htlc"]
-        and pol1["max_htlc_msat"] == pol2["max_htlc_msat"]
         and pol1["fee_base_msat"] == pol2["fee_base_msat"]
         and pol1["fee_rate_milli_msat"] == pol2["fee_rate_milli_msat"]
+        # Ignoring this for now since we use capacity/2
+        # and pol1["max_htlc_msat"] == pol2["max_htlc_msat"]
     )
 
 

test/graph_test.py

@@ -1,14 +1,13 @@
 #!/usr/bin/env python3
 
+import json
 import os
 import tempfile
 import uuid
 from pathlib import Path
-
+from warnet.utils import channel_match, DEFAULT_TAG
 from test_base import TestBase
-from warnet.utils import DEFAULT_TAG
 
-json_file_path = Path(os.path.dirname(__file__)) / "data" / "LN_10.json"
 
 base = TestBase()
 base.start_server()
@@ -41,6 +40,10 @@
     base.wait_for_all_tanks_status(target="stopped")
 
 print("Import graph")
+
+json_file_path = Path(os.path.dirname(__file__)) / "data" / "LN_10.json"
+NUM_NODES = 10
+
 with tempfile.TemporaryDirectory() as dir:
     tf = f"{dir}/{str(uuid.uuid4())}.graphml"
     if base.backend == "compose":
@@ -66,6 +69,18 @@
     base.warcli("scenarios run ln_init")
     base.wait_for_all_scenarios()
 
-    print(base.warcli("lncli 0 describegraph"))
+    print("Ensuring warnet LN channel policies match imported JSON description")
+    with open(json_file_path, "r") as file:
+        actual = json.loads(base.warcli(f"lncli 0 describegraph"))["edges"]
+        expected = json.loads(file.read())["edges"]
+        expected = sorted(expected, key=lambda chan: int(chan['channel_id']))
+        for chan_index, actual_chan in enumerate(actual):
+            expected_chan = expected[chan_index]
+            if not channel_match(actual_chan, expected_chan, allow_flip=True):
+                raise Exception(
+                    f"Channel policy doesn't match source: {actual_chan['channel_id']}\n" +
+                    "Actual:\n" + json.dumps(actual_chan, indent=2) +
+                    "Expected:\n" + json.dumps(expected_chan, indent=2)
+                )
 
 base.stop_server()