aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 23:24:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

wire gen, tlv: fixup broken methodname when tlvs are around

Browse Source 
including tlv's in the wire docs breaks the printwire because
there's a bad method name. this fixes that
This commit is contained in:
lisa neigut
2019-04-09 15:05:08 -07:00
committed by Rusty Russell
parent 0443b464ad
commit 51438cef21
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/generate-wire.py
View File

@@ -1184,7 +1184,7 @@ def print_tlv_printwire(tlv_name, messages):
printcases=printcases) printcases=printcases)
def print_tlv_printwires(tlv_fields): def print_tlv_printwires(enumname, tlv_fields):
decls = [] decls = []
switches = '' switches = ''
for name, messages in tlv_fields.items(): for name, messages in tlv_fields.items():
@@ -1196,7 +1196,7 @@ def print_tlv_printwires(tlv_fields):
# Print the 'master' print_tlv_messages cases # Print the 'master' print_tlv_messages cases
switches += tlv_switch_template.format(tlv_name=name) switches += tlv_switch_template.format(tlv_name=name)
decls.append(print_master_tlv_template.format(tlv_switches=switches)) decls.append(print_master_tlv_template.format(enumname=enumname, tlv_switches=switches))
return decls return decls
@@ -1444,7 +1444,7 @@ void print{enumname}_message(const u8 *msg)
""" """
print_master_tlv_template = """ print_master_tlv_template = """
void print_tlv_message(const char *tlv_name, const u8 *msg) void print{enumname}_tlv_message(const char *tlv_name, const u8 *msg)
{{ {{
\t{tlv_switches} \t{tlv_switches}
\tprintf("ERR: Unknown TLV message type: %s\\n", tlv_name); \tprintf("ERR: Unknown TLV message type: %s\\n", tlv_name);
@@ -1483,7 +1483,7 @@ if options.printwire:
decls = [m.print_printwire(options.header) for m in toplevel_messages + messages_with_option] decls = [m.print_printwire(options.header) for m in toplevel_messages + messages_with_option]
if not options.header: if not options.header:
if len(tlv_fields): if len(tlv_fields):
decls += print_tlv_printwires(tlv_fields) decls += print_tlv_printwires(options.enumname, tlv_fields)
else: else:
decls += [print_tlv_message_printwire_empty.format(enumname=options.enumname)] decls += [print_tlv_message_printwire_empty.format(enumname=options.enumname)]
else: else: