Fix CI tests ...

that broke because of layers created by renepay

Changelog-None

Signed-off-by: Lagrang3 <[email protected]>

Author: Lagrang3

tests/autogenerate-rpc-examples.py

@@ -2134,8 +2134,8 @@ def list_missing_examples():
         rune_l21 = generate_runes_examples(l1, l2, l3)
         generate_datastore_examples(l2)
         generate_bookkeeper_examples(l2, l3, c23res2['channel_id'])
-        offer_l23, inv_req_l1_l22 = generate_offers_renepay_examples(l1, l2, inv_l21, inv_l34)
         generate_askrene_examples(l1, l2, l3, c12, c23_2)
+        offer_l23, inv_req_l1_l22 = generate_offers_renepay_examples(l1, l2, inv_l21, inv_l34)
         generate_wait_examples(l1, l2, bitcoind, executor)
         address_l22 = generate_utils_examples(l1, l2, l3, l4, l5, l6, c23_2, c34_2, inv_l11, inv_l22, rune_l21, bitcoind)
         generate_splice_examples(node_factory, bitcoind)

tests/test_askrene.py

@@ -121,9 +121,10 @@ def test_reserve(node_factory):
 
 def test_layers(node_factory):
     """Test manipulating information in layers"""
-    # remove xpay, since it creates a layer!
-    l1, l2, l3 = node_factory.line_graph(3, wait_for_announce=True,
-                                         opts={'disable-plugin': 'cln-xpay'})
+    # remove xpay and renepay, since they create a layer!
+    l1, l2, l3 = node_factory.line_graph(
+        3, wait_for_announce=True, opts={"disable-plugin": ["cln-xpay", "cln-renepay"]}
+    )
 
     assert l2.rpc.askrene_listlayers() == {'layers': []}
     with pytest.raises(RpcError, match="Unknown layer"):
@@ -294,8 +295,9 @@ def test_layers(node_factory):
 
 def test_layer_persistence(node_factory):
     """Test persistence of layers across restart"""
-    l1, l2 = node_factory.line_graph(2, wait_for_announce=True,
-                                     opts={'disable-plugin': 'cln-xpay'})
+    l1, l2 = node_factory.line_graph(
+        2, wait_for_announce=True, opts={"disable-plugin": ["cln-xpay", "cln-renepay"]}
+    )
 
     assert l1.rpc.askrene_listlayers() == {'layers': []}
     with pytest.raises(RpcError, match="Unknown layer"):

tests/test_misc.py

@@ -3620,8 +3620,8 @@ def test_datastore_escapeing(node_factory):
 
 
 def test_datastore(node_factory):
-    # Suppress xpay, which makes a layer
-    l1 = node_factory.get_node(options={"disable-plugin": "cln-xpay"})
+    # Suppress xpay and renepay, which makes a layer
+    l1 = node_factory.get_node(options={"disable-plugin": ["cln-xpay", "cln-renepay"]})
 
     # Starts empty
     assert l1.rpc.listdatastore() == {'datastore': []}
@@ -3735,8 +3735,8 @@ def test_datastore(node_factory):
 
 
 def test_datastore_keylist(node_factory):
-    # Suppress xpay, which makes a layer
-    l1 = node_factory.get_node(options={"disable-plugin": "cln-xpay"})
+    # Suppress xpay and renepay, which makes a layer
+    l1 = node_factory.get_node(options={"disable-plugin": ["cln-xpay", "cln-renepay"]})
 
     # Starts empty
     assert l1.rpc.listdatastore() == {'datastore': []}
@@ -3798,7 +3798,9 @@ def test_datastore_keylist(node_factory):
 
 
 def test_datastoreusage(node_factory):
-    l1: LightningNode = node_factory.get_node(options={"disable-plugin": "cln-xpay"})
+    l1: LightningNode = node_factory.get_node(
+        options={"disable-plugin": ["cln-xpay", "cln-renepay"]}
+    )
     assert l1.rpc.datastoreusage() == {'datastoreusage': {'key': '[]', 'total_bytes': 0}}
 
     data = 'somedatatostoreinthedatastore'  # len 29