From 6f7b5806c35de7f2d3f325b1122f6bf4a39121d6 Mon Sep 17 00:00:00 2001
From: Michael Schmoock <michael@schmoock.net>
Date: Thu, 2 Sep 2021 14:42:57 +0930
Subject: [PATCH] pyln-client/gossmap: init GossmapNode and Id also with
 hexstring

also improves test coverage
Changelog-Added: pyln-client: routines for direct access to the gossip store as Gossmap
---
 contrib/pyln-client/pyln/client/gossmap.py |  4 ++++
 contrib/pyln-client/tests/test_gossmap.py  | 27 +++++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/contrib/pyln-client/pyln/client/gossmap.py b/contrib/pyln-client/pyln/client/gossmap.py
index 7fce16d876a6..0358e0748a5c 100755
--- a/contrib/pyln-client/pyln/client/gossmap.py
+++ b/contrib/pyln-client/pyln/client/gossmap.py
@@ -56,6 +56,8 @@ def __repr__(self):
 
 class GossmapNodeId(object):
     def __init__(self, buf: bytes):
+        if isinstance(buf, str):
+            buf = bytes.fromhex(buf)
         if len(buf) != 33 or (buf[0] != 2 and buf[0] != 3):
             raise ValueError("{} is not a valid node_id".format(buf.hex()))
         self.nodeid = buf
@@ -140,6 +142,8 @@ class GossmapNode(object):
 .channels is a list of the GossmapChannels attached to this node.
 """
     def __init__(self, node_id: GossmapNodeId):
+        if isinstance(node_id, bytes) or isinstance(node_id, str):
+            node_id = GossmapNodeId(node_id)
         self.announce_fields: Optional[Dict[str, Any]] = None
         self.announce_offset: Optional[int] = None
         self.channels: List[GossmapChannel] = []
diff --git a/contrib/pyln-client/tests/test_gossmap.py b/contrib/pyln-client/tests/test_gossmap.py
index 9e42f82ca841..c4e625011483 100644
--- a/contrib/pyln-client/tests/test_gossmap.py
+++ b/contrib/pyln-client/tests/test_gossmap.py
@@ -1,4 +1,4 @@
-from pyln.client import Gossmap
+from pyln.client import Gossmap, GossmapNode, GossmapNodeId
 
 import os.path
 import lzma
@@ -42,3 +42,28 @@ def test_gossmap(tmp_path):
     channel2 = g.get_channel("686200x1137x0")
     assert channel1.satoshis == 1000000
     assert channel2.satoshis == 3000000
+
+
+def test_objects():
+    boltz = "026165850492521f4ac8abd9bd8088123446d126f648ca35e60f88177dc149ceb2"
+    acinq = "03864ef025fde8fb587d989186ce6a4a186895ee44a926bfc370e2c366597a3f8f"
+
+    boltz_id = GossmapNodeId(bytes.fromhex(boltz))
+    acinq_id = GossmapNodeId(bytes.fromhex(acinq))
+    assert boltz_id == GossmapNodeId(boltz)
+
+    assert boltz_id < acinq_id
+    assert acinq_id > boltz_id
+    assert boltz_id != acinq_id
+    assert acinq_id != boltz_id
+    assert not boltz_id > acinq_id
+    assert not acinq_id < boltz_id
+    assert not boltz_id == acinq_id
+    assert not acinq_id == boltz_id
+
+    boltz_node = GossmapNode(boltz_id)
+    acinq_node = GossmapNode(acinq_id)
+    assert boltz_node == GossmapNode(boltz)
+    assert boltz_node < acinq_node
+    assert acinq_node > boltz_node
+    assert boltz_node != acinq_node