Skip to content

Commit e63b0af

Browse files
daywalker90sangbida
authored andcommitted
chore: replace v26.03 version mentions with v26.04
Allowing deprecated API's should actually allow them in test_sql_deprecated
1 parent 2044a91 commit e63b0af

8 files changed

Lines changed: 15 additions & 15 deletions

File tree

.msggen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10847,7 +10847,7 @@
1084710847
"deprecated": null
1084810848
},
1084910849
"ListPeerChannels.channel_id": {
10850-
"added": "v26.03",
10850+
"added": "v26.04",
1085110851
"deprecated": null
1085210852
},
1085310853
"ListPeerChannels.channels[]": {

contrib/msggen/msggen/schema.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23623,7 +23623,7 @@
2362323623
]
2362423624
},
2362523625
"channel_id": {
23626-
"added": "v26.03",
23626+
"added": "v26.04",
2362723627
"type": "hash",
2362823628
"description": [
2362923629
"If supplied, limits the channels to just this channel_id, if it exists. Cannot be used with 'id' or 'short_channel_id'."
@@ -24173,7 +24173,7 @@
2417324173
],
2417424174
"deprecated": [
2417524175
"v25.02",
24176-
"v26.03"
24176+
"v26.04"
2417724177
]
2417824178
},
2417924179
"their_max_htlc_value_in_flight_msat": {
@@ -37517,7 +37517,7 @@
3751737517
],
3751837518
"description": [
3751937519
"The channel state, in particular \"CHANNELD_NORMAL\" and \"CHANNELD_AWAITING_SPLICE\" mean the channel can be used normally.",
37520-
"The deprecated value 'unknown' is also present for new channels: after v26.03 this field will be omitted instead."
37520+
"The deprecated value 'unknown' is also present for new channels: after v26.04 this field will be omitted instead."
3752137521
],
3752237522
"added": "pre-v0.10.1"
3752337523
},

doc/contribute-to-core-lightning/release-checklist.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Here's a checklist for the release process.
6161
3. Create a PR with above changes.
6262
4. After the PR is merged, create and push the release tag:
6363
- Run `git pull`.
64-
- Set the current release version in your shell (e.g., if the current release is `v26.03`): `VERSION=26.03`
64+
- Set the current release version in your shell (e.g., if the current release is `v26.04`): `VERSION=26.04`
6565
- Create a signed, annotated tag: `git tag -a -s v$VERSION -m "v$VERSION"`
6666
- Push the tag: `git push origin v$VERSION`
6767
5. Pushing the tag will trigger the CI pipeline, which will draft the pre-release and upload the build artifacts with project-signed checksums.

doc/developers-guide/deprecated-features.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ privacy:
1010
| Name | Type | First Deprecated | Last Supported | Description |
1111
|----------------------------------------------------|--------------------|------------------|----------------|---------------------------------------------------------------------------------------------------------------------------|
1212
| xpay.ignore_bolt12_mpp | Field | v25.05 | v25.12 | Try MPP even if the BOLT12 invoice doesn't explicitly allow it (CLN didn't until 25.02) |
13-
| listpeerchannels.max_total_htlc_in_msat | Field | v25.02 | v26.03 | Use our_max_total_htlc_out_msat |
13+
| listpeerchannels.max_total_htlc_in_msat | Field | v25.02 | v26.04 | Use our_max_total_htlc_out_msat |
1414
| wait.details | Field | v25.05 | v26.06 | Use subsystem-specific object instead |
15-
| channel_state_changed.old_state.unknown | Notification Field | v25.05 | v26.03 | Value "unknown" is deprecated: field will be omitted instead |
15+
| channel_state_changed.old_state.unknown | Notification Field | v25.05 | v26.04 | Value "unknown" is deprecated: field will be omitted instead |
1616
| coin_movement.tags | Notification Field | v25.09 | v26.09 | Use `primary_tag` (first tag) and `extra_tags` instead |
1717
| coin_movement.utxo_txid | Notification Field | v25.09 | v26.09 | Use `utxo` instead of `utxo_txid` & `vout` |
1818
| coin_movement.txid | Notification Field | v25.09 | v26.09 | Use `spending_txid` instead |

doc/schemas/listpeerchannels.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
]
3333
},
3434
"channel_id": {
35-
"added": "v26.03",
35+
"added": "v26.04",
3636
"type": "hash",
3737
"description": [
3838
"If supplied, limits the channels to just this channel_id, if it exists. Cannot be used with 'id' or 'short_channel_id'."
@@ -582,7 +582,7 @@
582582
],
583583
"deprecated": [
584584
"v25.02",
585-
"v26.03"
585+
"v26.04"
586586
]
587587
},
588588
"their_max_htlc_value_in_flight_msat": {

doc/schemas/notification/channel_state_changed.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
],
6767
"description": [
6868
"The channel state, in particular \"CHANNELD_NORMAL\" and \"CHANNELD_AWAITING_SPLICE\" mean the channel can be used normally.",
69-
"The deprecated value 'unknown' is also present for new channels: after v26.03 this field will be omitted instead."
69+
"The deprecated value 'unknown' is also present for new channels: after v26.04 this field will be omitted instead."
7070
],
7171
"added": "pre-v0.10.1"
7272
},

lightningd/peer_control.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ static void NON_NULL_ARGS(1, 2, 4, 5) json_add_channel(struct command *cmd,
11971197
json_add_amount_sat_msat(response, "dust_limit_msat",
11981198
channel->our_config.dust_limit);
11991199
if (command_deprecated_out_ok(cmd, "max_total_htlc_in_msat",
1200-
"v25.02", "v26.03"))
1200+
"v25.02", "v26.04"))
12011201
json_add_amount_msat(response, "max_total_htlc_in_msat",
12021202
channel->our_config.max_htlc_value_in_flight);
12031203
json_add_amount_msat(

tests/test_plugin.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4317,11 +4317,11 @@ def test_sql(node_factory, bitcoind):
43174317

43184318

43194319
def test_sql_deprecated(node_factory, bitcoind):
4320-
l1, l2 = node_factory.line_graph(2, opts=[{'allow-deprecated-apis': True}, {}])
4320+
l1, l2 = node_factory.line_graph(2, opts=[{'allow-deprecated-apis': True, "broken_log": "DEPRECATED API USED: listpeerchannels.max_total_htlc_in_msat"}, {}])
43214321

4322-
# Even with deprecated APIs, this isn't there.
4323-
with pytest.raises(RpcError, match="Deprecated column table peerchannels.max_total_htlc_in_msat"):
4324-
l1.rpc.sql("SELECT max_total_htlc_in_msat FROM peerchannels;")
4322+
# With deprecated APIs, this is there.
4323+
ret = l1.rpc.sql("SELECT max_total_htlc_in_msat FROM peerchannels;")
4324+
assert ret == {'rows': [[-1]]}
43254325

43264326
# It's deprecated in l2, so that will fail!
43274327
with pytest.raises(RpcError, match="Deprecated column table peerchannels.max_total_htlc_in_msat"):

0 commit comments

Comments
 (0)