From 6e47bad6e7c0b95a8b959f5cdf5d094bbf2e715f Mon Sep 17 00:00:00 2001
From: Matthew Zipkin <pinheadmz@gmail.com>
Date: Tue, 6 Aug 2024 10:23:12 -0400
Subject: [PATCH] graphs: update schema in all graphml files

---
 resources/graphs/default.graphml       | 23 +++++++++++++++-------
 test/data/12_node_ring.graphml         | 20 +++++++++++++++----
 test/data/build_v24_test.graphml       | 21 +++++++++++++++-----
 test/data/ln.graphml                   |  3 ++-
 test/data/permutations.graphml         | 27 ++++++++++++++++----------
 test/data/services.graphml             |  1 +
 test/data/ten_semi_unconnected.graphml | 27 ++++++++++++++++----------
 7 files changed, 85 insertions(+), 37 deletions(-)

diff --git a/resources/graphs/default.graphml b/resources/graphs/default.graphml
index 153bd52b0..ce84579df 100644
--- a/resources/graphs/default.graphml
+++ b/resources/graphs/default.graphml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?><graphml xmlns="http://graphml.graphdrawing.org/xmlns">
-  <key attr.name="version" attr.type="string" for="node" id="version"/>
-  <key attr.name="bitcoin_config" attr.type="string" for="node" id="bitcoin_config"/>
-  <key attr.name="tc_netem" attr.type="string" for="node" id="tc_netem"/>
-  <key attr.name="build_args" attr.type="string" for="node" id="build_args"/>
-  <key attr.name="exporter" attr.type="boolean" for="node" id="exporter"/>
-  <key attr.name="collect_logs" attr.type="boolean" for="node" id="collect_logs"/>
-  <key attr.name="image" attr.type="string" for="node" id="image"/>
+  <key id="services"        attr.name="services"         attr.type="string"   for="graph" />
+  <key id="version"         attr.name="version"          attr.type="string"   for="node" />
+  <key id="image"           attr.name="image"            attr.type="string"   for="node" />
+  <key id="bitcoin_config"  attr.name="bitcoin_config"   attr.type="string"   for="node" />
+  <key id="tc_netem"        attr.name="tc_netem"         attr.type="string"   for="node" />
+  <key id="exporter"        attr.name="exporter"         attr.type="boolean"  for="node" />
+  <key id="metrics"         attr.name="metrics"          attr.type="string"   for="node" />
+  <key id="collect_logs"    attr.name="collect_logs"     attr.type="boolean"  for="node" />
+  <key id="build_args"      attr.name="build_args"       attr.type="string"   for="node" />
+  <key id="ln"              attr.name="ln"               attr.type="string"   for="node" />
+  <key id="ln_image"        attr.name="ln_image"         attr.type="string"   for="node" />
+  <key id="ln_cb_image"     attr.name="ln_cb_image"      attr.type="string"   for="node" />
+  <key id="ln_config"       attr.name="ln_config"        attr.type="string"   for="node" />
+  <key id="channel_open"    attr.name="channel_open"     attr.type="string"   for="edge" />
+  <key id="source_policy"   attr.name="source_policy"    attr.type="string"   for="edge" />
+  <key id="target_policy"   attr.name="target_policy"    attr.type="string"   for="edge" />
   <graph edgedefault="directed">
     <node id="0">
         <data key="version">27.0</data>
diff --git a/test/data/12_node_ring.graphml b/test/data/12_node_ring.graphml
index 20e0b25ee..7cdf3a7f7 100644
--- a/test/data/12_node_ring.graphml
+++ b/test/data/12_node_ring.graphml
@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?><graphml xmlns="http://graphml.graphdrawing.org/xmlns">
-  <key attr.name="version"        attr.type="string" for="node" id="version"/>
-  <key attr.name="bitcoin_config" attr.type="string" for="node" id="bitcoin_config"/>
-  <key attr.name="tc_netem"       attr.type="string" for="node" id="tc_netem"/>
-  <key attr.name="image"          attr.type="string" for="node" id="image"/>
+  <key id="services"        attr.name="services"         attr.type="string"   for="graph" />
+  <key id="version"         attr.name="version"          attr.type="string"   for="node" />
+  <key id="image"           attr.name="image"            attr.type="string"   for="node" />
+  <key id="bitcoin_config"  attr.name="bitcoin_config"   attr.type="string"   for="node" />
+  <key id="tc_netem"        attr.name="tc_netem"         attr.type="string"   for="node" />
+  <key id="exporter"        attr.name="exporter"         attr.type="boolean"  for="node" />
+  <key id="metrics"         attr.name="metrics"          attr.type="string"   for="node" />
+  <key id="collect_logs"    attr.name="collect_logs"     attr.type="boolean"  for="node" />
+  <key id="build_args"      attr.name="build_args"       attr.type="string"   for="node" />
+  <key id="ln"              attr.name="ln"               attr.type="string"   for="node" />
+  <key id="ln_image"        attr.name="ln_image"         attr.type="string"   for="node" />
+  <key id="ln_cb_image"     attr.name="ln_cb_image"      attr.type="string"   for="node" />
+  <key id="ln_config"       attr.name="ln_config"        attr.type="string"   for="node" />
+  <key id="channel_open"    attr.name="channel_open"     attr.type="string"   for="edge" />
+  <key id="source_policy"   attr.name="source_policy"    attr.type="string"   for="edge" />
+  <key id="target_policy"   attr.name="target_policy"    attr.type="string"   for="edge" />
   <graph edgedefault="directed">
     <node id="0">
         <data key="version">27.0</data>
diff --git a/test/data/build_v24_test.graphml b/test/data/build_v24_test.graphml
index 089b3f72d..5dc8c7297 100644
--- a/test/data/build_v24_test.graphml
+++ b/test/data/build_v24_test.graphml
@@ -1,9 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?><graphml xmlns="http://graphml.graphdrawing.org/xmlns">
-  <key attr.name="version"        attr.type="string" for="node" id="version"/>
-  <key attr.name="bitcoin_config" attr.type="string" for="node" id="bitcoin_config"/>
-  <key attr.name="tc_netem"       attr.type="string" for="node" id="tc_netem"/>
-  <key attr.name="build_args"     attr.type="string" for="node" id="build_args"/>
-  <key attr.name="image"          attr.type="string" for="node" id="image"/>
+  <key id="services"        attr.name="services"         attr.type="string"   for="graph" />
+  <key id="version"         attr.name="version"          attr.type="string"   for="node" />
+  <key id="image"           attr.name="image"            attr.type="string"   for="node" />
+  <key id="bitcoin_config"  attr.name="bitcoin_config"   attr.type="string"   for="node" />
+  <key id="tc_netem"        attr.name="tc_netem"         attr.type="string"   for="node" />
+  <key id="exporter"        attr.name="exporter"         attr.type="boolean"  for="node" />
+  <key id="metrics"         attr.name="metrics"          attr.type="string"   for="node" />
+  <key id="collect_logs"    attr.name="collect_logs"     attr.type="boolean"  for="node" />
+  <key id="build_args"      attr.name="build_args"       attr.type="string"   for="node" />
+  <key id="ln"              attr.name="ln"               attr.type="string"   for="node" />
+  <key id="ln_image"        attr.name="ln_image"         attr.type="string"   for="node" />
+  <key id="ln_cb_image"     attr.name="ln_cb_image"      attr.type="string"   for="node" />
+  <key id="ln_config"       attr.name="ln_config"        attr.type="string"   for="node" />
+  <key id="channel_open"    attr.name="channel_open"     attr.type="string"   for="edge" />
+  <key id="source_policy"   attr.name="source_policy"    attr.type="string"   for="edge" />
+  <key id="target_policy"   attr.name="target_policy"    attr.type="string"   for="edge" />
   <graph edgedefault="directed">
     <node id="0">
         <data key="version">27.0</data>
diff --git a/test/data/ln.graphml b/test/data/ln.graphml
index 2eb054039..e0606c93f 100644
--- a/test/data/ln.graphml
+++ b/test/data/ln.graphml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?><graphml xmlns="http://graphml.graphdrawing.org/xmlns">
-  <key id="version"         attr.name="version"          attr.type="string"   for="node" />
   <key id="services"        attr.name="services"         attr.type="string"   for="graph" />
+  <key id="version"         attr.name="version"          attr.type="string"   for="node" />
   <key id="image"           attr.name="image"            attr.type="string"   for="node" />
   <key id="bitcoin_config"  attr.name="bitcoin_config"   attr.type="string"   for="node" />
   <key id="tc_netem"        attr.name="tc_netem"         attr.type="string"   for="node" />
   <key id="exporter"        attr.name="exporter"         attr.type="boolean"  for="node" />
+  <key id="metrics"         attr.name="metrics"          attr.type="string"   for="node" />
   <key id="collect_logs"    attr.name="collect_logs"     attr.type="boolean"  for="node" />
   <key id="build_args"      attr.name="build_args"       attr.type="string"   for="node" />
   <key id="ln"              attr.name="ln"               attr.type="string"   for="node" />
diff --git a/test/data/permutations.graphml b/test/data/permutations.graphml
index 7bf557ec7..0c4686f61 100644
--- a/test/data/permutations.graphml
+++ b/test/data/permutations.graphml
@@ -1,13 +1,20 @@
-<?xml version='1.0' encoding='utf-8'?>
-<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://graphml.graphdrawing.org/xmlns/1.0/graphml.xsd">
-  <key id="image" for="node" attr.name="image" attr.type="string" />
-  <key id="collect_logs" for="node" attr.name="collect_logs" attr.type="boolean" />
-  <key id="exporter" for="node" attr.name="exporter" attr.type="boolean" />
-  <key id="build_args" for="node" attr.name="build_args" attr.type="string" />
-  <key id="tc_netem" for="node" attr.name="tc_netem" attr.type="string" />
-  <key id="bitcoin_config" for="node" attr.name="bitcoin_config" attr.type="string" />
-  <key id="version" for="node" attr.name="version" attr.type="string" />
+<?xml version="1.0" encoding="UTF-8"?><graphml xmlns="http://graphml.graphdrawing.org/xmlns">
+  <key id="services"        attr.name="services"         attr.type="string"   for="graph" />
+  <key id="version"         attr.name="version"          attr.type="string"   for="node" />
+  <key id="image"           attr.name="image"            attr.type="string"   for="node" />
+  <key id="bitcoin_config"  attr.name="bitcoin_config"   attr.type="string"   for="node" />
+  <key id="tc_netem"        attr.name="tc_netem"         attr.type="string"   for="node" />
+  <key id="exporter"        attr.name="exporter"         attr.type="boolean"  for="node" />
+  <key id="metrics"         attr.name="metrics"          attr.type="string"   for="node" />
+  <key id="collect_logs"    attr.name="collect_logs"     attr.type="boolean"  for="node" />
+  <key id="build_args"      attr.name="build_args"       attr.type="string"   for="node" />
+  <key id="ln"              attr.name="ln"               attr.type="string"   for="node" />
+  <key id="ln_image"        attr.name="ln_image"         attr.type="string"   for="node" />
+  <key id="ln_cb_image"     attr.name="ln_cb_image"      attr.type="string"   for="node" />
+  <key id="ln_config"       attr.name="ln_config"        attr.type="string"   for="node" />
+  <key id="channel_open"    attr.name="channel_open"     attr.type="string"   for="edge" />
+  <key id="source_policy"   attr.name="source_policy"    attr.type="string"   for="edge" />
+  <key id="target_policy"   attr.name="target_policy"    attr.type="string"   for="edge" />
   <graph edgedefault="directed">
     <node id="0">
       <data key="version">27.0</data>
diff --git a/test/data/services.graphml b/test/data/services.graphml
index 7b7ffab7b..c9e0a0d01 100644
--- a/test/data/services.graphml
+++ b/test/data/services.graphml
@@ -5,6 +5,7 @@
   <key id="bitcoin_config"  attr.name="bitcoin_config"   attr.type="string"   for="node" />
   <key id="tc_netem"        attr.name="tc_netem"         attr.type="string"   for="node" />
   <key id="exporter"        attr.name="exporter"         attr.type="boolean"  for="node" />
+  <key id="metrics"         attr.name="metrics"          attr.type="string"   for="node" />
   <key id="collect_logs"    attr.name="collect_logs"     attr.type="boolean"  for="node" />
   <key id="build_args"      attr.name="build_args"       attr.type="string"   for="node" />
   <key id="ln"              attr.name="ln"               attr.type="string"   for="node" />
diff --git a/test/data/ten_semi_unconnected.graphml b/test/data/ten_semi_unconnected.graphml
index 065be6127..c2277407c 100644
--- a/test/data/ten_semi_unconnected.graphml
+++ b/test/data/ten_semi_unconnected.graphml
@@ -1,13 +1,20 @@
-<?xml version='1.0' encoding='utf-8'?>
-<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://graphml.graphdrawing.org/xmlns/1.0/graphml.xsd">
-  <key id="image" for="node" attr.name="image" attr.type="string" />
-  <key id="collect_logs" for="node" attr.name="collect_logs" attr.type="boolean" />
-  <key id="exporter" for="node" attr.name="exporter" attr.type="boolean" />
-  <key id="build_args" for="node" attr.name="build_args" attr.type="string" />
-  <key id="tc_netem" for="node" attr.name="tc_netem" attr.type="string" />
-  <key id="bitcoin_config" for="node" attr.name="bitcoin_config" attr.type="string" />
-  <key id="version" for="node" attr.name="version" attr.type="string" />
+<?xml version="1.0" encoding="UTF-8"?><graphml xmlns="http://graphml.graphdrawing.org/xmlns">
+  <key id="services"        attr.name="services"         attr.type="string"   for="graph" />
+  <key id="version"         attr.name="version"          attr.type="string"   for="node" />
+  <key id="image"           attr.name="image"            attr.type="string"   for="node" />
+  <key id="bitcoin_config"  attr.name="bitcoin_config"   attr.type="string"   for="node" />
+  <key id="tc_netem"        attr.name="tc_netem"         attr.type="string"   for="node" />
+  <key id="exporter"        attr.name="exporter"         attr.type="boolean"  for="node" />
+  <key id="metrics"         attr.name="metrics"          attr.type="string"   for="node" />
+  <key id="collect_logs"    attr.name="collect_logs"     attr.type="boolean"  for="node" />
+  <key id="build_args"      attr.name="build_args"       attr.type="string"   for="node" />
+  <key id="ln"              attr.name="ln"               attr.type="string"   for="node" />
+  <key id="ln_image"        attr.name="ln_image"         attr.type="string"   for="node" />
+  <key id="ln_cb_image"     attr.name="ln_cb_image"      attr.type="string"   for="node" />
+  <key id="ln_config"       attr.name="ln_config"        attr.type="string"   for="node" />
+  <key id="channel_open"    attr.name="channel_open"     attr.type="string"   for="edge" />
+  <key id="source_policy"   attr.name="source_policy"    attr.type="string"   for="edge" />
+  <key id="target_policy"   attr.name="target_policy"    attr.type="string"   for="edge" />
   <graph edgedefault="directed">
     <node id="0">
       <data key="version">26.0</data>