aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-02 20:54:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
tidying things up!
This commit is contained in:
lisa neigut
2019-07-23 17:51:11 -05:00
committed by Rusty Russell
parent 236d26308f
commit 32eaae0cb9
23 changed files with 703 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
closingd/Makefile
View File

@@ -80,10 +80,10 @@ CLOSINGD_COMMON_OBJS := \
hsmd/gen_hsm_wire.o
closingd/gen_closing_wire.h: $(WIRE_GEN) closingd/closing_wire.csv
$(WIRE_GEN) --header $@ closing_wire_type < closingd/closing_wire.csv > $@
$(WIRE_GEN) --page header $@ closing_wire_type < closingd/closing_wire.csv > $@
closingd/gen_closing_wire.c: $(WIRE_GEN) closingd/closing_wire.csv
$(WIRE_GEN) ${@:.c=.h} closing_wire_type < closingd/closing_wire.csv > $@
$(WIRE_GEN) --page impl ${@:.c=.h} closing_wire_type < closingd/closing_wire.csv > $@
LIGHTNINGD_CLOSING_OBJS := $(LIGHTNINGD_CLOSING_SRC:.c=.o) $(LIGHTNINGD_CLOSING_GEN_SRC:.c=.o)

66
closingd/closing_wire.csv
View File

@@ -2,41 +2,41 @@
#include <common/htlc_wire.h>
#include <common/per_peer_state.h>
# Begin! (passes peer fd, gossipd-client fd)
closing_init,2001
closing_init,,pps,struct per_peer_state
closing_init,,funding_txid,struct bitcoin_txid
closing_init,,funding_txout,u16
closing_init,,funding_satoshi,struct amount_sat
closing_init,,local_fundingkey,struct pubkey
closing_init,,remote_fundingkey,struct pubkey
closing_init,,funder,enum side
closing_init,,local_sat,struct amount_sat
closing_init,,remote_sat,struct amount_sat
closing_init,,our_dust_limit,struct amount_sat
closing_init,,min_fee_satoshi,struct amount_sat
closing_init,,fee_limit_satoshi,struct amount_sat
closing_init,,initial_fee_satoshi,struct amount_sat
closing_init,,local_scriptpubkey_len,u16
closing_init,,local_scriptpubkey,local_scriptpubkey_len*u8
closing_init,,remote_scriptpubkey_len,u16
closing_init,,remote_scriptpubkey,remote_scriptpubkey_len*u8
closing_init,,reconnected,bool
closing_init,,next_index_local,u64
closing_init,,next_index_remote,u64
closing_init,,revocations_received,u64
closing_init,,channel_reestablish_len,u16
closing_init,,channel_reestablish,channel_reestablish_len*u8
closing_init,,final_scriptpubkey_len,u16
closing_init,,final_scriptpubkey,final_scriptpubkey_len*u8
closing_init,,last_remote_secret,struct secret
msgtype,closing_init,2001
msgdata,closing_init,pps,per_peer_state,
msgdata,closing_init,funding_txid,bitcoin_txid,
msgdata,closing_init,funding_txout,u16,
msgdata,closing_init,funding_satoshi,amount_sat,
msgdata,closing_init,local_fundingkey,pubkey,
msgdata,closing_init,remote_fundingkey,pubkey,
msgdata,closing_init,funder,e:side,
msgdata,closing_init,local_sat,amount_sat,
msgdata,closing_init,remote_sat,amount_sat,
msgdata,closing_init,our_dust_limit,amount_sat,
msgdata,closing_init,min_fee_satoshi,amount_sat,
msgdata,closing_init,fee_limit_satoshi,amount_sat,
msgdata,closing_init,initial_fee_satoshi,amount_sat,
msgdata,closing_init,local_scriptpubkey_len,u16,
msgdata,closing_init,local_scriptpubkey,u8,local_scriptpubkey_len
msgdata,closing_init,remote_scriptpubkey_len,u16,
msgdata,closing_init,remote_scriptpubkey,u8,remote_scriptpubkey_len
msgdata,closing_init,reconnected,bool,
msgdata,closing_init,next_index_local,u64,
msgdata,closing_init,next_index_remote,u64,
msgdata,closing_init,revocations_received,u64,
msgdata,closing_init,channel_reestablish_len,u16,
msgdata,closing_init,channel_reestablish,u8,channel_reestablish_len
msgdata,closing_init,final_scriptpubkey_len,u16,
msgdata,closing_init,final_scriptpubkey,u8,final_scriptpubkey_len
msgdata,closing_init,last_remote_secret,secret,
# We received an offer, save signature.
closing_received_signature,2002
closing_received_signature,,signature,struct bitcoin_signature
closing_received_signature,,tx,struct bitcoin_tx
msgtype,closing_received_signature,2002
msgdata,closing_received_signature,signature,bitcoin_signature,
msgdata,closing_received_signature,tx,bitcoin_tx,
closing_received_signature_reply,2102
closing_received_signature_reply,,closing_txid,struct bitcoin_txid
msgtype,closing_received_signature_reply,2102
msgdata,closing_received_signature_reply,closing_txid,bitcoin_txid,
# Negotiations complete, we're exiting.
closing_complete,2004
msgtype,closing_complete,2004
1 #include <common/cryptomsg.h>
2 #include <common/htlc_wire.h>
3 #include <common/per_peer_state.h>
4 # Begin! (passes peer fd, gossipd-client fd)
5 closing_init,2001 msgtype,closing_init,2001
6 closing_init,,pps,struct per_peer_state msgdata,closing_init,pps,per_peer_state,
7 closing_init,,funding_txid,struct bitcoin_txid msgdata,closing_init,funding_txid,bitcoin_txid,
8 closing_init,,funding_txout,u16 msgdata,closing_init,funding_txout,u16,
9 closing_init,,funding_satoshi,struct amount_sat msgdata,closing_init,funding_satoshi,amount_sat,
10 closing_init,,local_fundingkey,struct pubkey msgdata,closing_init,local_fundingkey,pubkey,
11 closing_init,,remote_fundingkey,struct pubkey msgdata,closing_init,remote_fundingkey,pubkey,
12 closing_init,,funder,enum side msgdata,closing_init,funder,e:side,
13 closing_init,,local_sat,struct amount_sat msgdata,closing_init,local_sat,amount_sat,
14 closing_init,,remote_sat,struct amount_sat msgdata,closing_init,remote_sat,amount_sat,
15 closing_init,,our_dust_limit,struct amount_sat msgdata,closing_init,our_dust_limit,amount_sat,
16 closing_init,,min_fee_satoshi,struct amount_sat msgdata,closing_init,min_fee_satoshi,amount_sat,
17 closing_init,,fee_limit_satoshi,struct amount_sat msgdata,closing_init,fee_limit_satoshi,amount_sat,
18 closing_init,,initial_fee_satoshi,struct amount_sat msgdata,closing_init,initial_fee_satoshi,amount_sat,
19 closing_init,,local_scriptpubkey_len,u16 msgdata,closing_init,local_scriptpubkey_len,u16,
20 closing_init,,local_scriptpubkey,local_scriptpubkey_len*u8 msgdata,closing_init,local_scriptpubkey,u8,local_scriptpubkey_len
21 closing_init,,remote_scriptpubkey_len,u16 msgdata,closing_init,remote_scriptpubkey_len,u16,
22 closing_init,,remote_scriptpubkey,remote_scriptpubkey_len*u8 msgdata,closing_init,remote_scriptpubkey,u8,remote_scriptpubkey_len
23 closing_init,,reconnected,bool msgdata,closing_init,reconnected,bool,
24 closing_init,,next_index_local,u64 msgdata,closing_init,next_index_local,u64,
25 closing_init,,next_index_remote,u64 msgdata,closing_init,next_index_remote,u64,
26 closing_init,,revocations_received,u64 msgdata,closing_init,revocations_received,u64,
27 closing_init,,channel_reestablish_len,u16 msgdata,closing_init,channel_reestablish_len,u16,
28 closing_init,,channel_reestablish,channel_reestablish_len*u8 msgdata,closing_init,channel_reestablish,u8,channel_reestablish_len
29 closing_init,,final_scriptpubkey_len,u16 msgdata,closing_init,final_scriptpubkey_len,u16,
30 closing_init,,final_scriptpubkey,final_scriptpubkey_len*u8 msgdata,closing_init,final_scriptpubkey,u8,final_scriptpubkey_len
31 closing_init,,last_remote_secret,struct secret msgdata,closing_init,last_remote_secret,secret,
32 # We received an offer, save signature.
33 closing_received_signature,2002 msgtype,closing_received_signature,2002
34 closing_received_signature,,signature,struct bitcoin_signature msgdata,closing_received_signature,signature,bitcoin_signature,
35 closing_received_signature,,tx,struct bitcoin_tx msgdata,closing_received_signature,tx,bitcoin_tx,
36 closing_received_signature_reply,2102 msgtype,closing_received_signature_reply,2102
37 closing_received_signature_reply,,closing_txid,struct bitcoin_txid msgdata,closing_received_signature_reply,closing_txid,bitcoin_txid,
38 # Negotiations complete, we're exiting.
39 closing_complete,2004 msgtype,closing_complete,2004
40
41
42