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

test: fix tlvs test in funding_locked tlv.

Browse Source 
This FIXME caught my eye, as it's wrong: TLVs are canonical, so they cannot
differ in bits and be equal.

The equality function needs to be written correctly, however, otherwise it
will crash!

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-09-10 11:25:31 +09:30
parent c6858748bb
commit e0259b246e
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wire/test/run-peer-wire.c
View File

@@ -811,9 +811,25 @@ static bool channel_announcement_eq(const struct msg_channel_announcement *a,
static bool funding_locked_eq(const struct msg_funding_locked *a,
const struct msg_funding_locked *b)
{
return eq_upto(a, b, tlvs) &&
memeq(a->tlvs->alias, sizeof(a->tlvs->alias), b->tlvs->alias,
sizeof(b->tlvs->alias));
if (!eq_upto(a, b, tlvs))
return false;
/* Both or neither */
if (!a->tlvs != !b->tlvs)
return false;
if (!a->tlvs)
return true;
/* Both or neither */
if (!a->tlvs->alias != !b->tlvs->alias)
return false;
if (!a->tlvs->alias)
return true;
return memeq(a->tlvs->alias, sizeof(a->tlvs->alias),
b->tlvs->alias, sizeof(b->tlvs->alias));
}
static bool announcement_signatures_eq(const struct msg_announcement_signatures *a,
@@ -1064,8 +1080,7 @@ int main(int argc, char *argv[])
msg = towire_struct_funding_locked(ctx, &fl);
fl2 = fromwire_struct_funding_locked(ctx, msg);
assert(funding_locked_eq(&fl, fl2));
/* FIXME: Corruptions in the TLV can still parse correctly, but won't be equal. */
/*test_corruption_tlv(&fl, fl2, funding_locked);*/
test_corruption_tlv(&fl, fl2, funding_locked);
memset(&as, 2, sizeof(as));