pytest: use l1/l2 naming and get_nodes() where appropriate.

Replace non-standard node variable names (n, n2, node, ln) with l1/l2
across test_plugin.py and test_misc.py.  Convert four tests in
test_connection.py to use get_nodes() instead of consecutive get_node()
calls with identical options (slightly faster).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: rustyrussell

tests/test_connection.py

@@ -257,8 +257,7 @@ def test_connect_standard_addr(node_factory):
 
 
 def test_reconnect_channel_peers(node_factory, executor):
-    l1 = node_factory.get_node(may_reconnect=True)
-    l2 = node_factory.get_node(may_reconnect=True)
+    l1, l2 = node_factory.get_nodes(2, {'may_reconnect': True})
     l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
 
     l1.fundchannel(l2, 10**6)
@@ -1202,8 +1201,7 @@ def test_funding_push(node_factory, bitcoind, chainparams):
     # We track balances, to verify that accounting is ok.
     coin_mvt_plugin = os.path.join(os.getcwd(), 'tests/plugins/coin_movements.py')
 
-    l1 = node_factory.get_node(options={'plugin': coin_mvt_plugin})
-    l2 = node_factory.get_node(options={'plugin': coin_mvt_plugin})
+    l1, l2 = node_factory.get_nodes(2, {'plugin': coin_mvt_plugin})
 
     l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
 
@@ -2677,8 +2675,7 @@ def test_update_fee_reconnect(node_factory, bitcoind):
 
 
 def test_multiple_channels(node_factory):
-    l1 = node_factory.get_node()
-    l2 = node_factory.get_node()
+    l1, l2 = node_factory.get_nodes(2)
 
     ret = l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
     assert ret['id'] == l2.info['id']
@@ -2705,8 +2702,7 @@ def test_multiple_channels(node_factory):
 @pytest.mark.openchannel('v1')
 @pytest.mark.openchannel('v2')
 def test_forget_channel(node_factory):
-    l1 = node_factory.get_node()
-    l2 = node_factory.get_node()
+    l1, l2 = node_factory.get_nodes(2)
     l1.fundwallet(10**6)
     l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
     l1.rpc.fundchannel(l2.info['id'], 10**5)

tests/test_misc.py

@@ -2868,11 +2868,11 @@ def test_new_node_is_mainnet(node_factory):
 
 
 def test_unicode_rpc(node_factory, executor, bitcoind):
-    node = node_factory.get_node()
+    l1 = node_factory.get_node()
     desc = "Some candy 🍬 and a nice glass of milk 🥛."
 
-    node.rpc.invoice(amount_msat=42, label=desc, description=desc)
-    invoices = node.rpc.listinvoices()['invoices']
+    l1.rpc.invoice(amount_msat=42, label=desc, description=desc)
+    invoices = l1.rpc.listinvoices()['invoices']
     assert(len(invoices) == 1)
     assert(invoices[0]['description'] == desc)
     assert(invoices[0]['label'] == desc)
@@ -2897,43 +2897,43 @@ def test_unix_socket_path_length(node_factory, bitcoind, directory, executor, db
 
 
 def test_waitblockheight(node_factory, executor, bitcoind):
-    node = node_factory.get_node()
+    l1 = node_factory.get_node()
 
-    sync_blockheight(bitcoind, [node])
+    sync_blockheight(bitcoind, [l1])
 
-    blockheight = node.rpc.getinfo()['blockheight']
+    blockheight = l1.rpc.getinfo()['blockheight']
 
     # Should succeed without waiting.
-    node.rpc.waitblockheight(blockheight - 2)
-    node.rpc.waitblockheight(blockheight - 1)
-    node.rpc.waitblockheight(blockheight)
+    l1.rpc.waitblockheight(blockheight - 2)
+    l1.rpc.waitblockheight(blockheight - 1)
+    l1.rpc.waitblockheight(blockheight)
 
     # Developer mode polls bitcoind every second, so 60 seconds is plenty.
     time = 60
 
     # Should not succeed yet.
-    fut2 = executor.submit(node.rpc.waitblockheight, blockheight + 2, time)
-    fut1 = executor.submit(node.rpc.waitblockheight, blockheight + 1, time)
+    fut2 = executor.submit(l1.rpc.waitblockheight, blockheight + 2, time)
+    fut1 = executor.submit(l1.rpc.waitblockheight, blockheight + 1, time)
     assert not fut1.done()
     assert not fut2.done()
 
     # Should take about ~1second and time out.
     with pytest.raises(RpcError):
-        node.rpc.waitblockheight(blockheight + 2, 1)
+        l1.rpc.waitblockheight(blockheight + 2, 1)
 
     # Others should still not be done.
     assert not fut1.done()
     assert not fut2.done()
 
     # Trigger just one more block.
     bitcoind.generate_block(1)
-    sync_blockheight(bitcoind, [node])
+    sync_blockheight(bitcoind, [l1])
     fut1.result(5)
     assert not fut2.done()
 
     # Trigger two blocks.
     bitcoind.generate_block(1)
-    sync_blockheight(bitcoind, [node])
+    sync_blockheight(bitcoind, [l1])
     fut2.result(5)