lightningd · chrisguida · Jan 26, 2024 · Jan 26, 2024 · Jan 26, 2024 · Jan 26, 2024
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,41 +12,39 @@ on:
 
 jobs:
   build-and-test:
-    name: Test PY=${{ matrix.python-version }}, DEV=${{ matrix.developer }}, EXP=${{ matrix.experimental }}, DEP=${{ matrix.deprecated }}
+    name: Test PY=${{ matrix.python-version }}, EXP=${{ matrix.experimental }}, DEP=${{ matrix.deprecated }}
     runs-on: ubuntu-latest
     timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9]
-        developer: [0,1]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         experimental: [1]
         deprecated: [0]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - name: Checkout c-lightning@master
-      uses: actions/checkout@v3
+    - name: Checkout c-lightning@v23.11
+      uses: actions/checkout@v4
       with:
         repository: 'ElementsProject/lightning'
         path: 'lightning'
-        ref: 'master'
+        ref: 'v23.11'
         submodules: 'recursive'
         fetch-depth: 0  # Required for pyln versions to be recognized
 
     - name: Download runtime dependencies
       run: |
-        export BITCOIND_VERSION="0.20.1"
-        wget https://storage.googleapis.com/c-lightning-tests/bitcoin-${BITCOIND_VERSION}-x86_64-linux-gnu.tar.bz2
-        tar -xjf bitcoin-${BITCOIND_VERSION}-x86_64-linux-gnu.tar.bz2
+        export BITCOIND_VERSION="22.0"
+        wget https://bitcoincore.org/bin/bitcoin-core-${BITCOIND_VERSION}/bitcoin-${BITCOIND_VERSION}-x86_64-linux-gnu.tar.gz
+        tar -xzf bitcoin-${BITCOIND_VERSION}-x86_64-linux-gnu.tar.gz
         sudo mv bitcoin-${BITCOIND_VERSION}/bin/* /usr/local/bin
         rm -rf bitcoin-${BITCOIND_VERSION}-x86_64-linux-gnu.tar.gz bitcoin-${BITCOIND_VERSION}
 
     - name: Compile & install c-lightning@master
       run: |
         export EXPERIMENTAL_FEATURES=${{ matrix.experimental }}
-        export DEVELOPER=${{ matrix.developer }}
         export COMPAT=${{ matrix.deprecated }}
         export VALGRIND=0
         sudo apt-get install -y \
@@ -82,14 +80,13 @@ jobs:
         sudo make install
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
     - name: Test with pytest
       run: |
         export EXPERIMENTAL_FEATURES=${{ matrix.experimental }}
-        export DEVELOPER=${{ matrix.developer }}
         export COMPAT=${{ matrix.deprecated }}
         export SLOW_MACHINE=1
         export TEST_DEBUG=1

diff --git a/drain/README.md → archive/drain/README.md b/drain/README.md → archive/drain/README.md
diff --git a/drain/__init__.py → archive/drain/__init__.py b/drain/__init__.py → archive/drain/__init__.py
diff --git a/drain/clnutils.py → archive/drain/clnutils.py b/drain/clnutils.py → archive/drain/clnutils.py
diff --git a/drain/drain.py → archive/drain/drain.py b/drain/drain.py → archive/drain/drain.py
@@ -351,7 +351,7 @@ def try_for_htlc_fee(payload, peer_id, amount, chunk, spendable_before):
 
 
 def read_params(command: str, scid: str, percentage: float, chunks: int,
-                retry_for: int, maxfeepercent: float, exemptfee: Millisatoshi):
+                retry_for: int, maxfeepercent: float, exemptfee: int):
 
     # check parameters
     if command != 'drain' and command != 'fill' and command != 'setbalance':
@@ -466,7 +466,7 @@ def execute(payload: dict):
 
 @plugin.method("drain")
 def drain(plugin, scid: str, percentage: float = 100, chunks: int = 0, retry_for: int = 60,
-          maxfeepercent: float = 0.5, exemptfee: Millisatoshi = Millisatoshi(5000)):
+          maxfeepercent: float = 0.5, exemptfee: int = 5000):
     """Draining channel liquidity with circular payments.
 
     Percentage defaults to 100, resulting in an empty channel.

diff --git a/drain/requirements-dev.txt → archive/drain/requirements-dev.txt b/drain/requirements-dev.txt → archive/drain/requirements-dev.txt
diff --git a/drain/requirements.txt → archive/drain/requirements.txt b/drain/requirements.txt → archive/drain/requirements.txt
diff --git a/drain/test_drain.py → archive/drain/test_drain.py b/drain/test_drain.py → archive/drain/test_drain.py
@@ -1,5 +1,4 @@
 from pyln.testing.fixtures import *  # noqa: F401,F403
-from pyln.testing.utils import DEVELOPER
 from pyln.client import RpcError
 from .utils import get_ours, get_theirs, wait_ours, wait_for_all_htlcs
 import os
@@ -24,7 +23,6 @@ def test_plugin_starts(node_factory):
     l1.start()
 
 
-@unittest.skipIf(not DEVELOPER, "slow gossip, needs DEVELOPER=1")
 def test_drain_and_refill(node_factory, bitcoind):
     # Scenario: first drain then refill
     #
@@ -84,7 +82,6 @@ def test_drain_and_refill(node_factory, bitcoind):
     assert(get_theirs(l1, scid12) < theirs_before * 0.05)
 
 
-@unittest.skipIf(not DEVELOPER, "slow gossip, needs DEVELOPER=1")
 def test_fill_and_drain(node_factory, bitcoind):
     # Scenario: first fill of an empty channel and drain afterwards.
     #
@@ -133,7 +130,6 @@ def test_fill_and_drain(node_factory, bitcoind):
     assert(get_theirs(l1, scid12) < theirs_before * 0.05)  # account some reserves
 
 
-@unittest.skipIf(not DEVELOPER, "slow gossip, needs DEVELOPER=1")
 def test_setbalance(node_factory, bitcoind):
     # SETUP: a basic circular setup to run setbalance tests
     #
@@ -194,7 +190,6 @@ def balance(node, node_a, scid_a, node_b, scid_b, node_c):
     wait_for_all_htlcs([node, node_a, node_b])
 
 
-@unittest.skipIf(not DEVELOPER, "slow gossip, needs DEVELOPER=1")
 def test_drain_chunks(node_factory, bitcoind):
     # SETUP: a small mesh that enables testing chunks
     #
@@ -277,7 +272,6 @@ def test_drain_chunks(node_factory, bitcoind):
     assert(get_theirs(l1, scid41) > amount * 0.9)
 
 
-@unittest.skipIf(not DEVELOPER, "slow gossip, needs DEVELOPER=1")
 def test_fill_chunks(node_factory, bitcoind):
     # SETUP: a small mesh that enables testing chunks
     #

diff --git a/drain/utils.py → archive/drain/utils.py b/drain/utils.py → archive/drain/utils.py
diff --git a/helpme/Makefile → archive/helpme/Makefile b/helpme/Makefile → archive/helpme/Makefile
diff --git a/helpme/README.md → archive/helpme/README.md b/helpme/README.md → archive/helpme/README.md
diff --git a/helpme/helpme.py → archive/helpme/helpme.py b/helpme/helpme.py → archive/helpme/helpme.py
diff --git a/helpme/requirements-dev.txt → archive/helpme/requirements-dev.txt b/helpme/requirements-dev.txt → archive/helpme/requirements-dev.txt
diff --git a/helpme/requirements.txt → archive/helpme/requirements.txt b/helpme/requirements.txt → archive/helpme/requirements.txt
diff --git a/helpme/test_helpme.py → archive/helpme/test_helpme.py b/helpme/test_helpme.py → archive/helpme/test_helpme.py
diff --git a/historian/README.org → archive/historian/README.org b/historian/README.org → archive/historian/README.org
diff --git a/historian/cli/backup.py → archive/historian/cli/backup.py b/historian/cli/backup.py → archive/historian/cli/backup.py
diff --git a/historian/cli/common.py → archive/historian/cli/common.py b/historian/cli/common.py → archive/historian/cli/common.py
diff --git a/historian/cli/db.py → archive/historian/cli/db.py b/historian/cli/db.py → archive/historian/cli/db.py
diff --git a/historian/common.py → archive/historian/common.py b/historian/common.py → archive/historian/common.py
diff --git a/historian/gossipd.py → archive/historian/gossipd.py b/historian/gossipd.py → archive/historian/gossipd.py
diff --git a/historian/historian-cli → archive/historian/historian-cli b/historian/historian-cli → archive/historian/historian-cli
diff --git a/historian/historian.py → archive/historian/historian.py b/historian/historian.py → archive/historian/historian.py
diff --git a/historian/poetry.lock → archive/historian/poetry.lock b/historian/poetry.lock → archive/historian/poetry.lock
diff --git a/historian/pyproject.toml → archive/historian/pyproject.toml b/historian/pyproject.toml → archive/historian/pyproject.toml
@@ -8,6 +8,7 @@ license = "MIT"
 [tool.poetry.dependencies]
 python = "^3.7"
 pyln-client = "0.11.1"
+inotify = "^0.2.10"
 
 [tool.poetry.dev-dependencies]
 pyln-testing = "0.11.1"

diff --git a/historian/test_historian.py → archive/historian/test_historian.py b/historian/test_historian.py → archive/historian/test_historian.py
diff --git a/paytest/README.org → archive/paytest/README.org b/paytest/README.org → archive/paytest/README.org
diff --git a/paytest/paytest.py → archive/paytest/paytest.py b/paytest/paytest.py → archive/paytest/paytest.py
diff --git a/paytest/poetry.lock → archive/paytest/poetry.lock b/paytest/poetry.lock → archive/paytest/poetry.lock
diff --git a/paytest/requirements.txt → archive/paytest/requirements.txt b/paytest/requirements.txt → archive/paytest/requirements.txt
diff --git a/paytest/test_paytest.py → archive/paytest/test_paytest.py b/paytest/test_paytest.py → archive/paytest/test_paytest.py
diff --git a/probe/README.md → archive/probe/README.md b/probe/README.md → archive/probe/README.md
diff --git a/probe/probe.py → archive/probe/probe.py b/probe/probe.py → archive/probe/probe.py
diff --git a/probe/requirements.txt → archive/probe/requirements.txt b/probe/requirements.txt → archive/probe/requirements.txt
diff --git a/probe/test_probe.py → archive/probe/test_probe.py b/probe/test_probe.py → archive/probe/test_probe.py
@@ -1,7 +1,6 @@
 import unittest
 import os
 from pyln.testing.fixtures import *  # noqa: F401,F403
-from pyln.testing.utils import DEVELOPER
 
 plugin_path = os.path.join(os.path.dirname(__file__), "probe.py")
 
@@ -18,7 +17,6 @@ def test_probe_starts(node_factory):
     l1.start()
 
 
-@unittest.skipIf(not DEVELOPER, "Gossip is slow")
 def test_probe(node_factory):
     l1, l2, l3, l4 = node_factory.line_graph(
         4,
@@ -36,7 +34,6 @@ def test_probe(node_factory):
     assert(res['failcode'] == 16399)
 
 
-@unittest.skipIf(not DEVELOPER, "Gossip is slow")
 def test_route_unreachable(node_factory):
     l1, l2, l3, l4 = node_factory.line_graph(
         4,

diff --git a/prometheus/README.md → archive/prometheus/README.md b/prometheus/README.md → archive/prometheus/README.md
diff --git a/prometheus/prometheus.py → archive/prometheus/prometheus.py b/prometheus/prometheus.py → archive/prometheus/prometheus.py
diff --git a/prometheus/requirements.txt → archive/prometheus/requirements.txt b/prometheus/requirements.txt → archive/prometheus/requirements.txt
diff --git a/prometheus/test_prometheus.py → archive/prometheus/test_prometheus.py b/prometheus/test_prometheus.py → archive/prometheus/test_prometheus.py
diff --git a/rebalance/README.md → archive/rebalance/README.md b/rebalance/README.md → archive/rebalance/README.md
diff --git a/rebalance/clnutils.py → archive/rebalance/clnutils.py b/rebalance/clnutils.py → archive/rebalance/clnutils.py
diff --git a/rebalance/rebalance.py → archive/rebalance/rebalance.py b/rebalance/rebalance.py → archive/rebalance/rebalance.py
diff --git a/rebalance/requirements.txt → archive/rebalance/requirements.txt b/rebalance/requirements.txt → archive/rebalance/requirements.txt
diff --git a/rebalance/test_rebalance.py → archive/rebalance/test_rebalance.py b/rebalance/test_rebalance.py → archive/rebalance/test_rebalance.py
diff --git a/summary/README.md → archive/summary/README.md b/summary/README.md → archive/summary/README.md
diff --git a/summary/__init__.py → archive/summary/__init__.py b/summary/__init__.py → archive/summary/__init__.py
diff --git a/summary/requirements.txt → archive/summary/requirements.txt b/summary/requirements.txt → archive/summary/requirements.txt
diff --git a/summary/summary.py → archive/summary/summary.py b/summary/summary.py → archive/summary/summary.py
diff --git a/summary/summary_avail.py → archive/summary/summary_avail.py b/summary/summary_avail.py → archive/summary/summary_avail.py
diff --git a/summary/test_summary.py → archive/summary/test_summary.py b/summary/test_summary.py → archive/summary/test_summary.py
@@ -5,7 +5,7 @@
 
 from pyln.client import Plugin
 from pyln.testing.fixtures import *  # noqa: F401,F403
-from pyln.testing.utils import DEVELOPER, wait_for
+from pyln.testing.utils import wait_for
 
 from .summary_avail import trace_availability
 
@@ -264,7 +264,6 @@ def test_summary_opts(directory):
         assert(o in help_out)
 
 
-@unittest.skipIf(not DEVELOPER, "We need fast gossip for line_graph")
 def test_summary_exclude(node_factory):
     l1, l2 = node_factory.line_graph(2, opts=pluginopt)
 

diff --git a/feeadjuster/test_feeadjuster.py b/feeadjuster/test_feeadjuster.py
@@ -4,7 +4,7 @@
 
 import unittest
 from pyln.testing.fixtures import *  # noqa: F401,F403
-from pyln.testing.utils import DEVELOPER, wait_for
+from pyln.testing.utils import wait_for
 
 
 plugin_path = os.path.join(os.path.dirname(__file__), "feeadjuster.py")
@@ -70,7 +70,6 @@ def sync_gossip(nodes, scids):
             wait_for(lambda: node.rpc.listchannels(scid) == n.rpc.listchannels(scid))
 
 
-@unittest.skipIf(not DEVELOPER, "Too slow without fast gossip")
 def test_feeadjuster_adjusts(node_factory):
     """
     A rather simple network:
@@ -140,7 +139,6 @@ def test_feeadjuster_adjusts(node_factory):
                              f'Adjusted fees of {scid_B} with a ratio of 0.2'])
 
 
-@unittest.skipIf(not DEVELOPER, "Too slow without fast gossip")
 def test_feeadjuster_imbalance(node_factory):
     """
     A rather simple network:
@@ -217,7 +215,6 @@ def test_feeadjuster_imbalance(node_factory):
     wait_for_fees(l2, scids, default_fees[0])
 
 
-@unittest.skipIf(not DEVELOPER, "Too slow without fast gossip")
 def test_feeadjuster_big_enough_liquidity(node_factory):
     """
     A rather simple network:
@@ -292,7 +289,6 @@ def test_feeadjuster_big_enough_liquidity(node_factory):
     wait_for_not_fees(l2, scids, default_fees[0])
 
 
-@unittest.skipIf(not DEVELOPER, "Too slow without fast gossip")
 def test_feeadjuster_median(node_factory):
     """
     A rather simple network:

diff --git a/jitrebalance/test_jitrebalance.py b/jitrebalance/test_jitrebalance.py
@@ -1,6 +1,6 @@
 from pyln.client import RpcError
 from pyln.testing.fixtures import *  # noqa: F401, F403
-from pyln.testing.utils import wait_for, DEVELOPER
+from pyln.testing.utils import wait_for
 import os
 import time
 import pytest
@@ -13,7 +13,6 @@
 reject_plugin = os.path.join(currdir, 'tests/refuse_htlcs.py')
 
 
-@unittest.skipIf(not DEVELOPER, "gossip is too slow if we're not in developer mode")
 def test_simple_rebalance(node_factory):
     """Simple rebalance that routes along a cycle to enable the original payment
 
@@ -82,7 +81,6 @@ def no_pending_htlcs():
     assert l2.daemon.is_in_log('Succesfully re-filled outgoing capacity')
 
 
-@unittest.skipIf(not DEVELOPER, "gossip is too slow if we're not in developer mode")
 def test_rebalance_failure(node_factory):
     """Same setup as the first test :
 
@@ -158,7 +156,6 @@ def no_pending_htlcs():
     assert l2.daemon.is_in_log('Timed out while trying to rebalance')
 
 
-@unittest.skipIf(not DEVELOPER, "gossip is too slow if we're not in developer mode")
 def test_issue_88(node_factory):
     """Reproduce issue #88: crash due to unconfirmed channel.
 

diff --git a/noise/test_chat.py b/noise/test_chat.py
@@ -3,7 +3,7 @@
 from pprint import pprint
 from pyln.client import RpcError
 from pyln.testing.fixtures import *  # noqa: F401,F403
-from pyln.testing.utils import DEVELOPER, wait_for
+from pyln.testing.utils import wait_for
 import hashlib
 import os
 import pytest
@@ -33,7 +33,6 @@ def test_sendmsg_success(node_factory, executor):
 
 
 @flaky  # since we cannot force a payment to take a specific route
-@unittest.skipIf(not DEVELOPER, "Fails often")
 @unittest.skipIf(True, "Just not stable")
 def test_sendmsg_retry(node_factory, executor):
     """Fail a sendmsg using a cheap route, and check that it retries.