Skip to content

Commit 2992536

Browse files
committed
Drop SplicePrototype feature
Now that `SplicePrototype` and `SpliceProduction` share the same feature bit, there's not really any reason to have the `SplicePrototype` feature at all. Instead, we drop it, leaving only a `Splice` feature.
1 parent aee75b9 commit 2992536

1 file changed

Lines changed: 8 additions & 19 deletions

File tree

lightning-types/src/features.rs

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ mod sealed {
166166
// Byte 6
167167
ZeroConf,
168168
// Byte 7
169-
Trampoline | SimpleClose | SpliceProduction | SplicePrototype,
169+
Trampoline | SimpleClose | Splice,
170170
// Byte 8 - 16
171171
,,,,,,,,,
172172
// Byte 17
@@ -195,7 +195,7 @@ mod sealed {
195195
// Byte 6
196196
ZeroConf | Keysend,
197197
// Byte 7
198-
Trampoline | SimpleClose | SpliceProduction | SplicePrototype,
198+
Trampoline | SimpleClose | Splice,
199199
// Byte 8 - 16
200200
,,,,,,,,,
201201
// Byte 17
@@ -687,14 +687,14 @@ mod sealed {
687687
);
688688
define_feature!(
689689
63,
690-
SpliceProduction,
690+
Splice,
691691
[InitContext, NodeContext],
692692
"Feature flags for channel splicing.",
693-
set_splicing_production_optional,
694-
set_splicing_production_required,
695-
clear_splicing_production,
696-
supports_splicing_production,
697-
requires_splicing_production
693+
set_splicing_optional,
694+
set_splicing_required,
695+
clear_splicing,
696+
supports_splicing,
697+
requires_splicing
698698
);
699699
// By default, allocate enough bytes to cover up to Splice. Update this as new features are
700700
// added which we expect to appear commonly across contexts.
@@ -721,17 +721,6 @@ mod sealed {
721721
supports_htlc_hold,
722722
requires_htlc_hold
723723
);
724-
define_feature!(
725-
63, // Actually the SpliceProduction feature
726-
SplicePrototype,
727-
[InitContext, NodeContext],
728-
"Feature flags for channel splicing.",
729-
set_splicing_optional,
730-
set_splicing_required,
731-
clear_splicing,
732-
supports_splicing,
733-
requires_splicing
734-
);
735724
define_feature!(
736725
259,
737726
DnsResolver,

0 commit comments

Comments
 (0)