Makefile: update CLN_NEXT_VERSION so deprecations tick over.

Indeed, we now need to adjust our tests to use --i-promise-to-fix-broken-api-user
for the specific APIs past end-of-life.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2024-03-25 11:06:20 +10:30
parent ed4af14d4c
commit 037eb08fd6
2 changed files with 4 additions and 6 deletions

View file

@ -4,7 +4,7 @@
VERSION=$(shell git describe --always --dirty=-modded --abbrev=7 2>/dev/null || pwd | sed -n 's|.*/c\{0,1\}lightning-v\{0,1\}\([0-9a-f.rc\-]*\)$$|\1|gp')
# Next release.
CLN_NEXT_VERSION := v24.02
CLN_NEXT_VERSION := v24.05
# --quiet / -s means quiet, dammit!
ifeq ($(findstring s,$(word 1, $(MAKEFLAGS))),s)

View file

@ -568,15 +568,13 @@ def test_waitanyinvoice_reversed(node_factory, executor):
def test_autocleaninvoice_deprecated(node_factory):
# This is so deprecated it emits a broken message when we use it!
l1 = node_factory.get_node(options={'allow-deprecated-apis': True}, allow_broken_log=True)
# This is so deprecated we have to re-enable it by name!
l1 = node_factory.get_node(options={'i-promise-to-fix-broken-api-user': 'autocleaninvoice'})
l1.rpc.invoice(amount_msat=12300, label='inv1', description='description1', expiry=4)
l1.rpc.invoice(amount_msat=12300, label='inv2', description='description2', expiry=12)
l1.rpc.autocleaninvoice(cycle_seconds=8, expired_by=2)
# Should log the correct name of the API
l1.daemon.wait_for_log(r"\*\*BROKEN\*\* jsonrpc#[0-9]*: DEPRECATED API USED autocleaninvoice ")
start_time = time.time()
# time 0
@ -709,7 +707,7 @@ def test_listinvoices_filter(node_factory):
def test_wait_invoices(node_factory, executor):
# We use delexpiredinvoice, and CLN complains!
l1, l2 = node_factory.line_graph(2, opts={'allow-deprecated-apis': True, 'allow_broken_log': True})
l1, l2 = node_factory.line_graph(2, opts={'i-promise-to-fix-broken-api-user': 'delexpiredinvoice'})
# Asking for 0 gives us current index.
waitres = l2.rpc.call('wait', {'subsystem': 'invoices', 'indexname': 'created', 'nextvalue': 0})