Skip to content

Commit bc41d07

Browse files
committed
Makefile: update so we know next version is v25.12
And add broken-log suppression to the tests which use deprecated features on their last gasp. Signed-off-by: Rusty Russell <[email protected]>
1 parent 6a05f24 commit bc41d07

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
VERSION=$(shell git describe --tags --always --dirty=-modded --abbrev=7 2>/dev/null || pwd | sed -n 's|.*/c\{0,1\}lightning-v\{0,1\}\([0-9a-f.rc\-]*\)$$|v\1|gp')
55

66
# Next release.
7-
CLN_NEXT_VERSION := v25.09
7+
CLN_NEXT_VERSION := v25.12
88

99
# --quiet / -s means quiet, dammit!
1010
ifeq ($(findstring s,$(word 1, $(MAKEFLAGS))),s)

tests/test_pay.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5441,7 +5441,7 @@ def test_invoice_pay_desc_with_quotes(node_factory):
54415441
invoice = l2.rpc.invoice(label="test12345", amount_msat=1000,
54425442
description=description, deschashonly=True)["bolt11"]
54435443

5444-
l1.rpc.decodepay(invoice, description)
5444+
l1.rpc.decode(invoice)
54455445

54465446
# pay an invoice
54475447
l1.rpc.pay(invoice, description=description)
@@ -6048,7 +6048,8 @@ def test_fetch_no_description_with_amount(node_factory):
60486048

60496049
def test_decodepay(node_factory, chainparams):
60506050
"""Test we don't break (deprecated) decodepay command"""
6051-
l1 = node_factory.get_node(options={'allow-deprecated-apis': True})
6051+
l1 = node_factory.get_node(options={'allow-deprecated-apis': True},
6052+
broken_log="DEPRECATED API USED decodepay")
60526053

60536054
addr1 = l1.rpc.newaddr('bech32')['bech32']
60546055
addr2 = '2MxqzNANJNAdMjHQq8ZLkwzooxAFiRzXvEz' if not chainparams['elements'] else 'XGx1E2JSTLZLmqYMAo3CGpsco85aS7so33'

tests/test_xpay.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,7 @@ def test_xpay_bolt12_no_mpp(node_factory, chainparams, deprecations):
665665
if deprecations is True:
666666
for o in opts:
667667
o['allow-deprecated-apis'] = True
668+
o['broken_log'] = 'DEPRECATED API USED: xpay.ignore_bolt12_mpp'
668669

669670
l1, l2, l3, l4 = node_factory.get_nodes(4, opts=opts)
670671
node_factory.join_nodes([l1, l2, l3], wait_for_announce=True)

0 commit comments

Comments
 (0)