From 46cbca97ea4cedeabe7b563acdee898c6ef605da Mon Sep 17 00:00:00 2001 From: lisa neigut Date: Tue, 23 Jul 2019 23:20:04 -0500 Subject: [PATCH] bolt-gen: use 'enum' instead of 'e:' prefix for enums use 'enum ' in wirespec instead of 'e:' as an indicator that a field is an enum. --- channeld/channel_wire.csv | 8 ++++---- closingd/closing_wire.csv | 2 +- common/status_wire.csv | 6 +++--- connectd/connect_wire.csv | 2 +- onchaind/onchain_wire.csv | 6 +++--- tools/generate-wire.py | 4 ++-- tools/test/test_cases | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/channeld/channel_wire.csv b/channeld/channel_wire.csv index 3f9a3cbeb..b1f14b9a8 100644 --- a/channeld/channel_wire.csv +++ b/channeld/channel_wire.csv @@ -22,7 +22,7 @@ msgdata,channel_init,remote_fundingkey,pubkey, msgdata,channel_init,remote_basepoints,basepoints, msgdata,channel_init,remote_per_commit,pubkey, msgdata,channel_init,old_remote_per_commit,pubkey, -msgdata,channel_init,funder,e:side, +msgdata,channel_init,funder,enum side, msgdata,channel_init,fee_base,u32, msgdata,channel_init,fee_proportional,u32, msgdata,channel_init,local_msatoshi,amount_msat, @@ -41,13 +41,13 @@ msgdata,channel_init,revocations_received,u64, msgdata,channel_init,next_htlc_id,u64, msgdata,channel_init,num_htlcs,u16, msgdata,channel_init,htlcs,added_htlc,num_htlcs -msgdata,channel_init,htlc_states,e:htlc_state,num_htlcs +msgdata,channel_init,htlc_states,enum htlc_state,num_htlcs msgdata,channel_init,num_fulfilled,u16, msgdata,channel_init,fulfilled,fulfilled_htlc,num_fulfilled -msgdata,channel_init,fulfilled_sides,e:side,num_fulfilled +msgdata,channel_init,fulfilled_sides,enum side,num_fulfilled msgdata,channel_init,num_failed,u16, msgdata,channel_init,failed,failed_htlc,num_failed -msgdata,channel_init,failed_sides,e:side,num_failed +msgdata,channel_init,failed_sides,enum side,num_failed msgdata,channel_init,local_funding_locked,bool, msgdata,channel_init,remote_funding_locked,bool, msgdata,channel_init,funding_short_id,short_channel_id, diff --git a/closingd/closing_wire.csv b/closingd/closing_wire.csv index 2f181776c..a85cee41e 100644 --- a/closingd/closing_wire.csv +++ b/closingd/closing_wire.csv @@ -9,7 +9,7 @@ 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,funder,enum side, msgdata,closing_init,local_sat,amount_sat, msgdata,closing_init,remote_sat,amount_sat, msgdata,closing_init,our_dust_limit,amount_sat, diff --git a/common/status_wire.csv b/common/status_wire.csv index f10c0078d..d5408de05 100644 --- a/common/status_wire.csv +++ b/common/status_wire.csv @@ -2,17 +2,17 @@ #include msgtype,status_log,0xFFF0 -msgdata,status_log,level,e:log_level, +msgdata,status_log,level,enum log_level, msgdata,status_log,entry,wirestring, msgtype,status_io,0xFFF1 -msgdata,status_io,iodir,e:log_level, +msgdata,status_io,iodir,enum log_level, msgdata,status_io,who,wirestring, msgdata,status_io,len,u16, msgdata,status_io,data,u8,len msgtype,status_fail,0xFFF2 -msgdata,status_fail,failreason,e:status_failreason, +msgdata,status_fail,failreason,enum status_failreason, msgdata,status_fail,desc,wirestring, msgtype,status_peer_connection_lost,0xFFF3 diff --git a/connectd/connect_wire.csv b/connectd/connect_wire.csv index a20511719..d2fc2f0df 100644 --- a/connectd/connect_wire.csv +++ b/connectd/connect_wire.csv @@ -7,7 +7,7 @@ msgtype,connectctl_init,2000 msgdata,connectctl_init,id,node_id, msgdata,connectctl_init,num_wireaddrs,u16, msgdata,connectctl_init,wireaddrs,wireaddr_internal,num_wireaddrs -msgdata,connectctl_init,listen_announce,e:addr_listen_announce,num_wireaddrs +msgdata,connectctl_init,listen_announce,enum addr_listen_announce,num_wireaddrs msgdata,connectctl_init,tor_proxyaddr,?wireaddr, msgdata,connectctl_init,use_tor_proxy_always,bool, msgdata,connectctl_init,dev_allow_localhost,bool, diff --git a/onchaind/onchain_wire.csv b/onchaind/onchain_wire.csv index 6043af623..eef640480 100644 --- a/onchaind/onchain_wire.csv +++ b/onchaind/onchain_wire.csv @@ -22,7 +22,7 @@ msgdata,onchain_init,remote_scriptpubkey_len,u16, msgdata,onchain_init,remote_scriptpubkey,u8,remote_scriptpubkey_len msgdata,onchain_init,ourwallet_pubkey,pubkey, # We need these two for commit number obscurer -msgdata,onchain_init,funder,e:side, +msgdata,onchain_init,funder,enum side, msgdata,onchain_init,local_basepoints,basepoints, msgdata,onchain_init,remote_basepoints,basepoints, msgdata,onchain_init,tx,bitcoin_tx, @@ -49,7 +49,7 @@ msgtype,onchain_init_reply,5101 # onchaind->master: Send out a tx. msgtype,onchain_broadcast_tx,5003 msgdata,onchain_broadcast_tx,tx,bitcoin_tx, -msgdata,onchain_broadcast_tx,type,e:wallet_tx_type, +msgdata,onchain_broadcast_tx,type,enum wallet_tx_type, # master->onchaind: Notifier that an output has been spent by input_num of tx. msgtype,onchain_spent,5004 @@ -106,4 +106,4 @@ msgdata,onchain_dev_memleak_reply,leak,bool, # transactions. msgtype,onchain_transaction_annotate,5034 msgdata,onchain_transaction_annotate,txid,bitcoin_txid, -msgdata,onchain_transaction_annotate,type,e:wallet_tx_type, +msgdata,onchain_transaction_annotate,type,enum wallet_tx_type, diff --git a/tools/generate-wire.py b/tools/generate-wire.py index b0e003454..1b6354744 100755 --- a/tools/generate-wire.py +++ b/tools/generate-wire.py @@ -239,8 +239,8 @@ class Type(FieldSet): self.tlv = False def parse_name(self, name): - if name.startswith('e:'): - return name[2:], True + if name.startswith('enum '): + return name[5:], True return name, False def add_data_field(self, field_name, type_obj, count=1, diff --git a/tools/test/test_cases b/tools/test/test_cases index 39a5b8b44..5adff8fa8 100644 --- a/tools/test/test_cases +++ b/tools/test/test_cases @@ -26,7 +26,7 @@ msgdata,test_msg,test_varsize_struct_varlen,test_features,len_varsize_struct # assignable msgdata,test_msg,test_assignable,u16, # enum -msgdata,test_msg,test_enum,e:test_enum, +msgdata,test_msg,test_enum,enum test_enum, # test struct msgdata,test_msg,test_struct,test_short_id, # test var-size struct