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

utils: add a global secp, fix wire to use it.

Browse Source 
This repairs make check.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-12-02 18:11:06 +10:30
parent 1f447688bc
commit c938ebb5c0
7 changed files with 43 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
wire/tools/generate-wire.py
View File

@@ -8,20 +8,12 @@ import re
Enumtype = namedtuple('Enumtype', ['name', 'value'])
# Field types that require a crypto context
crypto_types = [
'struct pubkey',
'struct signature'
]
class Field(object):
def __init__(self,message,name,size):
self.message = message
self.name = name.replace('-', '_')
(self.typename, self.basesize) = Field._guess_type(message,self.name,size)
self.is_crypto = self.typename in crypto_types
try:
if int(size) % self.basesize != 0:
raise ValueError('Invalid size {} for {}.{} not a multiple of {}'.format(size,self.message,self.name,self.basesize))
@@ -110,7 +102,6 @@ class Message(object):
self.name = name
self.enum = enum
self.fields = []
self.is_crypto = False
def checkLenField(self,field):
for f in self.fields:
@@ -132,7 +123,6 @@ class Message(object):
if field.is_variable_size():
self.checkLenField(field)
self.fields.append(field)
self.is_crypto |= field.is_crypto
def print_structure(self):
print('struct msg_{} {{'.format(self.name));
@@ -149,9 +139,7 @@ class Message(object):
print('};')
def print_fromwire(self,is_header):
crypto_arg = "secp256k1_context *secpctx, " if self.is_crypto else ""
print('struct msg_{0} *fromwire_{0}({1}const tal_t *ctx, const void *p, size_t *len)'.format(self.name, crypto_arg), end='')
print('struct msg_{0} *fromwire_{0}(const tal_t *ctx, const void *p, size_t *len)'.format(self.name), end='')
if is_header:
print(';')
@@ -168,25 +156,24 @@ class Message(object):
if f.typename.startswith('struct '):
basetype=f.typename[7:]
crypto_param = "secpctx, " if f.is_crypto else ""
if f.is_array():
print("\t//1th case", f.name)
print('\tfromwire_{}_array({}&cursor, len, in->{}, {});'
.format(basetype, crypto_param, f.name, f.num_elems))
print('\tfromwire_{}_array(&cursor, len, in->{}, {});'
.format(basetype, f.name, f.num_elems))
elif f.is_variable_size():
print("\t//2th case", f.name)
print('\tin->{} = tal_arr(in, {}, in->{});'
.format(f.name, f.typename, f.lenvar))
print('\tfromwire_{}_array({}&cursor, len, in->{}, in->{});'
.format(basetype, crypto_param, f.name, f.lenvar))
print('\tfromwire_{}_array(&cursor, len, in->{}, in->{});'
.format(basetype, f.name, f.lenvar))
elif f.is_assignable():
print("\t//3th case", f.name)
print('\tin->{} = fromwire_{}(&cursor, len);'
.format(f.name, basetype))
else:
print("\t//4th case", f.name)
print('\tfromwire_{}({}&cursor, len, &in->{});'
.format(basetype, crypto_param, f.name))
print('\tfromwire_{}(&cursor, len, &in->{});'
.format(basetype, f.name))
print('\n'
'\tif (!cursor)\n'
@@ -195,8 +182,7 @@ class Message(object):
'}\n')
def print_towire(self,is_header):
crypto_arg = "secp256k1_context *secpctx, " if self.is_crypto else ""
print('u8 *towire_{0}({1}const tal_t *ctx, const struct msg_{0} *out)'.format(self.name, crypto_arg), end='')
print('u8 *towire_{0}(const tal_t *ctx, const struct msg_{0} *out)'.format(self.name), end='')
if is_header:
print(';')
@@ -212,19 +198,18 @@ class Message(object):
if f.typename.startswith('struct '):
basetype=f.typename[7:]
crypto_param = "secpctx, " if f.is_crypto else ""
if f.is_array():
print('\ttowire_{}_array({}&p, out->{}, {});'
.format(basetype, crypto_param, f.name, f.num_elems))
print('\ttowire_{}_array(&p, out->{}, {});'
.format(basetype, f.name, f.num_elems))
elif f.is_variable_size():
print('\ttowire_{}_array({}&p, out->{}, out->{});'
.format(basetype, crypto_param, f.name, f.lenvar))
print('\ttowire_{}_array(&p, out->{}, out->{});'
.format(basetype, f.name, f.lenvar))
elif f.is_assignable():
print('\ttowire_{}({}&p, out->{});'
.format(basetype, crypto_param, f.name))
print('\ttowire_{}(&p, out->{});'
.format(basetype, f.name))
else:
print('\ttowire_{}({}&p, &out->{});'
.format(basetype, crypto_param, f.name))
print('\ttowire_{}(&p, &out->{});'
.format(basetype, f.name))
print('\n'
'\treturn p;\n'