From aad959a297ff66946effb165518143be15777dd6 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 27 Apr 2023 13:54:42 +0930 Subject: [PATCH] tools: remove option handling now last optional field was removed. 6fee63fc342736a2eb7f6e856ae0d85807cc50ec made `htlc_maximum_msat` compulsory, which was the last "optional" field. All future options will be TLVs, so we never need to parse the "] (optionxxx)" format for fields again. We allow options for messages, but only for documentation (we have some messages which are only for `gossip_queries`), so we don't put it in the output. Here's the before/after diff of the output for all the spec files: ```diff --- /tmp/before 2023-04-27 14:21:07.417170213 +0930 +++ /tmp/after 2023-04-27 14:19:39.184573086 +0930 @@ -273,7 +273,7 @@ msgdata,channel_update,fee_base_msat,u32, msgdata,channel_update,fee_proportional_millionths,u32, msgdata,channel_update,htlc_maximum_msat,u64, -msgtype,query_short_channel_ids,261,gossip_queries +msgtype,query_short_channel_ids,261 msgdata,query_short_channel_ids,chain_hash,chain_hash, msgdata,query_short_channel_ids,len,u16, msgdata,query_short_channel_ids,encoded_short_ids,byte,len @@ -281,17 +281,17 @@ tlvtype,query_short_channel_ids_tlvs,query_flags,1 tlvdata,query_short_channel_ids_tlvs,query_flags,encoding_type,byte, tlvdata,query_short_channel_ids_tlvs,query_flags,encoded_query_flags,byte,... -msgtype,reply_short_channel_ids_end,262,gossip_queries +msgtype,reply_short_channel_ids_end,262 msgdata,reply_short_channel_ids_end,chain_hash,chain_hash, msgdata,reply_short_channel_ids_end,full_information,byte, -msgtype,query_channel_range,263,gossip_queries +msgtype,query_channel_range,263 msgdata,query_channel_range,chain_hash,chain_hash, msgdata,query_channel_range,first_blocknum,u32, msgdata,query_channel_range,number_of_blocks,u32, msgdata,query_channel_range,tlvs,query_channel_range_tlvs, tlvtype,query_channel_range_tlvs,query_option,1 tlvdata,query_channel_range_tlvs,query_option,query_option_flags,bigsize, -msgtype,reply_channel_range,264,gossip_queries +msgtype,reply_channel_range,264 msgdata,reply_channel_range,chain_hash,chain_hash, msgdata,reply_channel_range,first_blocknum,u32, msgdata,reply_channel_range,number_of_blocks,u32, @@ -310,7 +310,7 @@ subtype,channel_update_checksums subtypedata,channel_update_checksums,checksum_node_id_1,u32, subtypedata,channel_update_checksums,checksum_node_id_2,u32, -msgtype,gossip_timestamp_filter,265,gossip_queries +msgtype,gossip_timestamp_filter,265 msgdata,gossip_timestamp_filter,chain_hash,chain_hash, msgdata,gossip_timestamp_filter,first_timestamp,u32, msgdata,gossip_timestamp_filter,timestamp_range,u32, ``` Signed-off-by: Rusty Russell --- tools/extract-formats.py | 60 ++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/tools/extract-formats.py b/tools/extract-formats.py index 834adeb70..8b716b4d9 100755 --- a/tools/extract-formats.py +++ b/tools/extract-formats.py @@ -6,16 +6,16 @@ # Outputs: # # Standard message types: -# msgtype,,[,