pyln: Migrate remaining uses of the deprecated pylightning module

`pylightning` is not much more than an alias for `pyln-client`, so this
removes the need to install that as well just to run the tests.

Makefile

@@ -272,7 +272,7 @@ ifeq ($(PYTEST),)
 	exit 1
 else
 # Explicitly hand DEVELOPER and VALGRIND so you can override on make cmd line.
-	PYTHONPATH=`pwd`/contrib/pyln-client:`pwd`/contrib/pyln-testing:`pwd`/contrib/pylightning:`pwd`/contrib/pyln-proto/:$(PYTHONPATH) TEST_DEBUG=1 DEVELOPER=$(DEVELOPER) VALGRIND=$(VALGRIND) $(PYTEST) tests/ $(PYTEST_OPTS)
+	PYTHONPATH=`pwd`/contrib/pyln-client:`pwd`/contrib/pyln-testing:`pwd`/contrib/pyln-proto/:$(PYTHONPATH) TEST_DEBUG=1 DEVELOPER=$(DEVELOPER) VALGRIND=$(VALGRIND) $(PYTEST) tests/ $(PYTEST_OPTS)
 endif
 
 # Keep includes in alpha order.

contrib/plugins/helloworld.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from lightning import Plugin
+from pyln.client import Plugin
 import time
 
 plugin = Plugin()

tests/plugins/accepter_close_to.py

@@ -9,7 +9,7 @@
       - otherwise: we don't include the close_to
 """
 
-from lightning import Plugin, Millisatoshi
+from pyln.client import Plugin, Millisatoshi
 
 plugin = Plugin()
 

tests/plugins/asynctest.py

@@ -6,7 +6,7 @@ stashed away, and are only resolved on the fifth invocation. All calls
 will then return the argument of the fifth call.
 
 """
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 

tests/plugins/broken.py

@@ -3,7 +3,7 @@
 misbehaving plugin via RPC.
 """
 
-from lightning import Plugin
+from pyln.client import Plugin
 import an_unexistent_module_that_will_make_me_crash
 
 plugin = Plugin(dynamic=False)

tests/plugins/dblog.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """This plugin is used to check that db_write calls are working correctly.
 """
-from lightning import Plugin, RpcError
+from pyln.client import Plugin, RpcError
 import sqlite3
 
 plugin = Plugin()

tests/plugins/fail_htlcs.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 

tests/plugins/forward_payment_status.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """This plugin is used to check that forward_event calls are working correctly.
 """
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 

tests/plugins/hold_htlcs.py

@@ -7,7 +7,7 @@ settled/forwarded/
 """
 
 
-from lightning import Plugin
+from pyln.client import Plugin
 import json
 import os
 import tempfile

tests/plugins/hold_invoice.py

@@ -2,7 +2,7 @@
 """Simple plugin to allow testing while closing of HTLC is delayed.
 """
 
-from lightning import Plugin
+from pyln.client import Plugin
 import time
 
 plugin = Plugin()

tests/plugins/millisatoshis.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from lightning import Plugin, Millisatoshi
+from pyln.client import Plugin, Millisatoshi
 
 
 plugin = Plugin(autopatch=True)

tests/plugins/misc_notifications.py

@@ -4,7 +4,7 @@
 Only used for 'channel_opened' for now.
 """
 
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 

tests/plugins/options.py

@@ -3,7 +3,7 @@
 
 The plugin offers 3 options, one of each supported type.
 """
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 

tests/plugins/pretend_badlog.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """This plugin is used to check that warning(unusual/broken level log) calls are working correctly.
 """
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 

tests/plugins/print_htlc_onion.py

@@ -5,7 +5,7 @@ We use this to check whether they're TLV or not
 
 """
 
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 

tests/plugins/reject.py

@@ -7,7 +7,7 @@ continue.
 
 """
 
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 

tests/plugins/reject_odd_funding_amounts.py

@@ -4,7 +4,7 @@
 We just refuse to let them open channels with an odd amount of millisatoshis.
 """
 
-from lightning import Plugin, Millisatoshi
+from pyln.client import Plugin, Millisatoshi
 
 plugin = Plugin()
 

tests/plugins/reject_some_invoices.py

@@ -4,7 +4,7 @@
 We just refuse to let them pay invoices with preimages divisible by 16.
 """
 
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 

tests/plugins/rpc_command.py

@@ -2,7 +2,7 @@
 """
 This plugin is used to test the `rpc_command` hook.
 """
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 

tests/plugins/sendpay_notifications.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """This plugin is used to check that sendpay_success and sendpay_failure calls are working correctly.
 """
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 

tests/plugins/shortcircuit.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 

tests/plugins/slow_init.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from lightning import Plugin
+from pyln.client import Plugin
 import time
 
 plugin = Plugin()

tests/plugins/static.py

@@ -5,7 +5,7 @@ A plugin started with dynamic to False cannot be controlled after lightningd
 has been started.
 """
 
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin(dynamic=False)
 

tests/plugins/utf8.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from lightning import Plugin
+from pyln.client import Plugin
 
 
 plugin = Plugin()