wire-gen: move in-house wire delcarations to new format

tidying things up!

gossipd/gossip_wire.csv

@@ -3,160 +3,160 @@
 #include <wire/gen_onion_wire.h>
 
 # Initialize the gossip daemon.
-gossipctl_init,3000
-gossipctl_init,,chain_hash,struct bitcoin_blkid
-gossipctl_init,,id,struct node_id
-gossipctl_init,,gflen,u16
-gossipctl_init,,globalfeatures,gflen*u8
-gossipctl_init,,rgb,3*u8
-gossipctl_init,,alias,32*u8
-gossipctl_init,,update_channel_interval,u32
-gossipctl_init,,num_announcable,u16
-gossipctl_init,,announcable,num_announcable*struct wireaddr
-gossipctl_init,,dev_gossip_time,?u32
+msgtype,gossipctl_init,3000
+msgdata,gossipctl_init,chain_hash,bitcoin_blkid,
+msgdata,gossipctl_init,id,node_id,
+msgdata,gossipctl_init,gflen,u16,
+msgdata,gossipctl_init,globalfeatures,u8,gflen
+msgdata,gossipctl_init,rgb,u8,3
+msgdata,gossipctl_init,alias,u8,32
+msgdata,gossipctl_init,update_channel_interval,u32,
+msgdata,gossipctl_init,num_announcable,u16,
+msgdata,gossipctl_init,announcable,wireaddr,num_announcable
+msgdata,gossipctl_init,dev_gossip_time,?u32,
 
 # Pass JSON-RPC getnodes call through
-gossip_getnodes_request,3005
-gossip_getnodes_request,,id,?struct node_id
+msgtype,gossip_getnodes_request,3005
+msgdata,gossip_getnodes_request,id,?node_id,
 
 #include <lightningd/gossip_msg.h>
-gossip_getnodes_reply,3105
-gossip_getnodes_reply,,num_nodes,u32
-gossip_getnodes_reply,,nodes,num_nodes*struct gossip_getnodes_entry
+msgtype,gossip_getnodes_reply,3105
+msgdata,gossip_getnodes_reply,num_nodes,u32,
+msgdata,gossip_getnodes_reply,nodes,gossip_getnodes_entry,num_nodes
 
 # Pass JSON-RPC getroute call through
-gossip_getroute_request,3006
+msgtype,gossip_getroute_request,3006
 # Source defaults to "us", and means we don't consider first-hop channel fees
-gossip_getroute_request,,source,?struct node_id
-gossip_getroute_request,,destination,struct node_id
-gossip_getroute_request,,msatoshi,struct amount_msat
-# We don't pass doubles, so pass riskfactor * 1000000.
-gossip_getroute_request,,riskfactor_by_million,u64
-gossip_getroute_request,,final_cltv,u32
-gossip_getroute_request,,fuzz,double
-gossip_getroute_request,,num_excluded,u16
-gossip_getroute_request,,excluded,num_excluded*struct short_channel_id_dir
-gossip_getroute_request,,max_hops,u32
+msgdata,gossip_getroute_request,source,?node_id,
+msgdata,gossip_getroute_request,destination,node_id,
+msgdata,gossip_getroute_request,msatoshi,amount_msat,
+# We don't pass doubles, so pass riskfactor  1000000.
+msgdata,gossip_getroute_request,riskfactor_by_million,u64,
+msgdata,gossip_getroute_request,final_cltv,u32,
+msgdata,gossip_getroute_request,fuzz,double,
+msgdata,gossip_getroute_request,num_excluded,u16,
+msgdata,gossip_getroute_request,excluded,short_channel_id_dir,num_excluded
+msgdata,gossip_getroute_request,max_hops,u32,
 
-gossip_getroute_reply,3106
-gossip_getroute_reply,,num_hops,u16
-gossip_getroute_reply,,hops,num_hops*struct route_hop
+msgtype,gossip_getroute_reply,3106
+msgdata,gossip_getroute_reply,num_hops,u16,
+msgdata,gossip_getroute_reply,hops,route_hop,num_hops
 
-gossip_getchannels_request,3007
-gossip_getchannels_request,,short_channel_id,?struct short_channel_id
-gossip_getchannels_request,,source,?struct node_id
-gossip_getchannels_request,,prev,?struct short_channel_id
+msgtype,gossip_getchannels_request,3007
+msgdata,gossip_getchannels_request,short_channel_id,?short_channel_id,
+msgdata,gossip_getchannels_request,source,?node_id,
+msgdata,gossip_getchannels_request,prev,?short_channel_id,
 
-gossip_getchannels_reply,3107
-gossip_getchannels_reply,,complete,bool
-gossip_getchannels_reply,,num_channels,u32
-gossip_getchannels_reply,,nodes,num_channels*struct gossip_getchannels_entry
+msgtype,gossip_getchannels_reply,3107
+msgdata,gossip_getchannels_reply,complete,bool,
+msgdata,gossip_getchannels_reply,num_channels,u32,
+msgdata,gossip_getchannels_reply,nodes,gossip_getchannels_entry,num_channels
 
 # Ping/pong test.  Waits for a reply if it expects one.
-gossip_ping,3008
-gossip_ping,,id,struct node_id
-gossip_ping,,num_pong_bytes,u16
-gossip_ping,,len,u16
+msgtype,gossip_ping,3008
+msgdata,gossip_ping,id,node_id,
+msgdata,gossip_ping,num_pong_bytes,u16,
+msgdata,gossip_ping,len,u16,
 
-gossip_ping_reply,3108
-gossip_ping_reply,,id,struct node_id
+msgtype,gossip_ping_reply,3108
+msgdata,gossip_ping_reply,id,node_id,
 # False if id in gossip_ping was unknown.
-gossip_ping_reply,,sent,bool
+msgdata,gossip_ping_reply,sent,bool,
 # 0 == no pong expected
-gossip_ping_reply,,totlen,u16
+msgdata,gossip_ping_reply,totlen,u16,
 
 # Test of query_short_channel_ids.  Master->gossipd
-gossip_query_scids,3031
-gossip_query_scids,,id,struct node_id
-gossip_query_scids,,num_ids,u16
-gossip_query_scids,,ids,num_ids*struct short_channel_id
+msgtype,gossip_query_scids,3031
+msgdata,gossip_query_scids,id,node_id,
+msgdata,gossip_query_scids,num_ids,u16,
+msgdata,gossip_query_scids,ids,short_channel_id,num_ids
 
 # Gossipd -> master
-gossip_scids_reply,3131
-gossip_scids_reply,,ok,bool
-gossip_scids_reply,,complete,bool
+msgtype,gossip_scids_reply,3131
+msgdata,gossip_scids_reply,ok,bool,
+msgdata,gossip_scids_reply,complete,bool,
 
 # Test gossip timestamp filtering.
-gossip_send_timestamp_filter,3028
-gossip_send_timestamp_filter,,id,struct node_id
-gossip_send_timestamp_filter,,first_timestamp,u32
-gossip_send_timestamp_filter,,timestamp_range,u32
+msgtype,gossip_send_timestamp_filter,3028
+msgdata,gossip_send_timestamp_filter,id,node_id,
+msgdata,gossip_send_timestamp_filter,first_timestamp,u32,
+msgdata,gossip_send_timestamp_filter,timestamp_range,u32,
 
 # Test of query_channel_range.  Master->gossipd
-gossip_query_channel_range,3029
-gossip_query_channel_range,,id,struct node_id
-gossip_query_channel_range,,first_blocknum,u32
-gossip_query_channel_range,,number_of_blocks,u32
+msgtype,gossip_query_channel_range,3029
+msgdata,gossip_query_channel_range,id,node_id,
+msgdata,gossip_query_channel_range,first_blocknum,u32,
+msgdata,gossip_query_channel_range,number_of_blocks,u32,
 
 # Gossipd -> master
-gossip_query_channel_range_reply,3129
-gossip_query_channel_range_reply,,final_first_block,u32
-gossip_query_channel_range_reply,,final_num_blocks,u32
-gossip_query_channel_range_reply,,final_complete,bool
-gossip_query_channel_range_reply,,num,u16
-gossip_query_channel_range_reply,,scids,num*struct short_channel_id
+msgtype,gossip_query_channel_range_reply,3129
+msgdata,gossip_query_channel_range_reply,final_first_block,u32,
+msgdata,gossip_query_channel_range_reply,final_num_blocks,u32,
+msgdata,gossip_query_channel_range_reply,final_complete,bool,
+msgdata,gossip_query_channel_range_reply,num,u16,
+msgdata,gossip_query_channel_range_reply,scids,short_channel_id,num
 
 # Set artificial maximum reply_channel_range size.  Master->gossipd
-gossip_dev_set_max_scids_encode_size,3030
-gossip_dev_set_max_scids_encode_size,,max,u32
+msgtype,gossip_dev_set_max_scids_encode_size,3030
+msgdata,gossip_dev_set_max_scids_encode_size,max,u32,
 
 # Given a short_channel_id, return the other endpoint (or none if DNE)
-gossip_get_channel_peer,3009
-gossip_get_channel_peer,,channel_id,struct short_channel_id
+msgtype,gossip_get_channel_peer,3009
+msgdata,gossip_get_channel_peer,channel_id,short_channel_id,
 
-gossip_get_channel_peer_reply,3109
-gossip_get_channel_peer_reply,,peer_id,?struct node_id
+msgtype,gossip_get_channel_peer_reply,3109
+msgdata,gossip_get_channel_peer_reply,peer_id,?node_id,
 
 # gossipd->master: we're closing this channel.
-gossip_local_channel_close,3027
-gossip_local_channel_close,,short_channel_id,struct short_channel_id
+msgtype,gossip_local_channel_close,3027
+msgdata,gossip_local_channel_close,short_channel_id,short_channel_id,
 
 # Gossipd->master get this tx output please.
-gossip_get_txout,3018
-gossip_get_txout,,short_channel_id,struct short_channel_id
+msgtype,gossip_get_txout,3018
+msgdata,gossip_get_txout,short_channel_id,short_channel_id,
 
 # master->gossipd here is the output, or empty if none.
-gossip_get_txout_reply,3118
-gossip_get_txout_reply,,short_channel_id,struct short_channel_id
-gossip_get_txout_reply,,satoshis,struct amount_sat
-gossip_get_txout_reply,,len,u16
-gossip_get_txout_reply,,outscript,len*u8
+msgtype,gossip_get_txout_reply,3118
+msgdata,gossip_get_txout_reply,short_channel_id,short_channel_id,
+msgdata,gossip_get_txout_reply,satoshis,amount_sat,
+msgdata,gossip_get_txout_reply,len,u16,
+msgdata,gossip_get_txout_reply,outscript,u8,len
 
 # master->gossipd an htlc failed with this onion error.
-gossip_payment_failure,3021
-gossip_payment_failure,,erring_node,struct node_id
-gossip_payment_failure,,erring_channel,struct short_channel_id
-gossip_payment_failure,,erring_channel_direction,u8
-gossip_payment_failure,,len,u16
-gossip_payment_failure,,error,len*u8
+msgtype,gossip_payment_failure,3021
+msgdata,gossip_payment_failure,erring_node,node_id,
+msgdata,gossip_payment_failure,erring_channel,short_channel_id,
+msgdata,gossip_payment_failure,erring_channel_direction,u8,
+msgdata,gossip_payment_failure,len,u16,
+msgdata,gossip_payment_failure,error,u8,len
 
 # master -> gossipd: a potential funding outpoint was spent, please forget the eventual channel
-gossip_outpoint_spent,3024
-gossip_outpoint_spent,,short_channel_id,struct short_channel_id
+msgtype,gossip_outpoint_spent,3024
+msgdata,gossip_outpoint_spent,short_channel_id,short_channel_id,
 
 # master -> gossipd: stop gossip timers.
-gossip_dev_suppress,3032
+msgtype,gossip_dev_suppress,3032
 
 # master -> gossipd: do you have a memleak?
-gossip_dev_memleak,3033
+msgtype,gossip_dev_memleak,3033
 
-gossip_dev_memleak_reply,3133
-gossip_dev_memleak_reply,,leak,bool
+msgtype,gossip_dev_memleak_reply,3133
+msgdata,gossip_dev_memleak_reply,leak,bool,
 
 # master -> gossipd: please rewrite the gossip_store
-gossip_dev_compact_store,3034
+msgtype,gossip_dev_compact_store,3034
 
 # gossipd -> master: ok
-gossip_dev_compact_store_reply,3134
-gossip_dev_compact_store_reply,,success,bool
+msgtype,gossip_dev_compact_store_reply,3134
+msgdata,gossip_dev_compact_store_reply,success,bool,
 
 #include <common/bolt11.h>
 
 # master -> gossipd: get route_info for our incoming channels
-gossip_get_incoming_channels,3025
-gossip_get_incoming_channels,,private_too,?bool
+msgtype,gossip_get_incoming_channels,3025
+msgdata,gossip_get_incoming_channels,private_too,?bool,
 
 # gossipd -> master: here they are.
-gossip_get_incoming_channels_reply,3125
-gossip_get_incoming_channels_reply,,num,u16
-gossip_get_incoming_channels_reply,,route_info,num*struct route_info
+msgtype,gossip_get_incoming_channels_reply,3125
+msgdata,gossip_get_incoming_channels_reply,num,u16,
+msgdata,gossip_get_incoming_channels_reply,route_info,route_info,num