mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 09:54:16 +01:00
Code Issues Projects Releases Wiki Activity

tlv: Migrate run-tlvstream to typesafe helpers

Browse Source
This commit is contained in:
Christian Decker 2019-11-25 20:55:57 +01:00 committed by Rusty Russell
parent 69c17d2d31
commit 838001af4c
1 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
wire/test/run-tlvstream.c
View File

@ -457,15 +457,13 @@ int main(void)
orig_p = stream(tmpctx, invalid_streams_either[i].hex); orig_p = stream(tmpctx, invalid_streams_either[i].hex);
max = tal_count(orig_p); max = tal_count(orig_p);
p = orig_p; p = orig_p;
assert(!fromwire_tlvs(&p, &max, tlvs_n1, TLVS_N1_ARRAY_SIZE, assert((!fromwire_n1(&p, &max, tlv_n1) && !p) ||
tlv_n1)); !n1_is_valid(tlv_n1, NULL));
assert(!p);
assert(strstr(invalid_streams_either[i].reason, reason)); assert(strstr(invalid_streams_either[i].reason, reason));
max = tal_count(orig_p); max = tal_count(orig_p);
p = orig_p; p = orig_p;
assert(!fromwire_tlvs(&p, &max, tlvs_n2, TLVS_N2_ARRAY_SIZE, assert((!fromwire_n2(&p, &max, tlv_n2) && !p) ||
tlv_n2)); !n2_is_valid(tlv_n2, NULL));
assert(!p);
assert(strstr(invalid_streams_either[i].reason, reason)); assert(strstr(invalid_streams_either[i].reason, reason));
} }
@ -476,9 +474,8 @@ int main(void)
p = stream(tmpctx, invalid_streams_n1[i].hex); p = stream(tmpctx, invalid_streams_n1[i].hex);
max = tal_count(p); max = tal_count(p);
assert(!fromwire_tlvs(&p, &max, tlvs_n1, TLVS_N1_ARRAY_SIZE, assert((!fromwire_n1(&p, &max, tlv_n1) && !p) ||
tlv_n1)); !n1_is_valid(tlv_n1, NULL));
assert(!p);
assert(strstr(invalid_streams_n1[i].reason, reason)); assert(strstr(invalid_streams_n1[i].reason, reason));
} }
@ -489,9 +486,8 @@ int main(void)
p = stream(tmpctx, invalid_streams_n1_combo[i].hex); p = stream(tmpctx, invalid_streams_n1_combo[i].hex);
max = tal_count(p); max = tal_count(p);
assert(!fromwire_tlvs(&p, &max, tlvs_n1, TLVS_N1_ARRAY_SIZE, assert((!fromwire_n1(&p, &max, tlv_n1) && !p) ||
tlv_n1)); !n1_is_valid(tlv_n1, NULL));
assert(!p);
assert(strstr(invalid_streams_n1_combo[i].reason, reason)); assert(strstr(invalid_streams_n1_combo[i].reason, reason));
} }
@ -502,9 +498,8 @@ int main(void)
p = stream(tmpctx, invalid_streams_n2_combo[i].hex); p = stream(tmpctx, invalid_streams_n2_combo[i].hex);
max = tal_count(p); max = tal_count(p);
assert(!fromwire_tlvs(&p, &max, tlvs_n2, TLVS_N2_ARRAY_SIZE, assert((!fromwire_n2(&p, &max, tlv_n2) && !p) ||
tlv_n2)); !n2_is_valid(tlv_n2, NULL));
assert(!p);
assert(strstr(invalid_streams_n2_combo[i].reason, reason)); assert(strstr(invalid_streams_n2_combo[i].reason, reason));
} }
@ -518,9 +513,8 @@ int main(void)
max = tal_count(orig_p); max = tal_count(orig_p);
p = orig_p; p = orig_p;
assert(fromwire_tlvs(&p, &max, tlvs_n1, TLVS_N1_ARRAY_SIZE, assert(fromwire_n1(&p, &max, tlv_n1) &&
tlv_n1)); n1_is_valid(tlv_n1, NULL));
assert(p);
assert(max == 0); assert(max == 0);
assert(tlv_n1_eq(tlv_n1, &valid_streams[i].expect)); assert(tlv_n1_eq(tlv_n1, &valid_streams[i].expect));
@ -551,16 +545,12 @@ int main(void)
invalid_streams_either[i].hex); invalid_streams_either[i].hex);
max = tal_count(orig_p); max = tal_count(orig_p);
p = orig_p; p = orig_p;
assert(!fromwire_tlvs(&p, &max, assert((!fromwire_n1(&p, &max, tlv_n1) && !p) ||
tlvs_n1, TLVS_N1_ARRAY_SIZE, !n1_is_valid(tlv_n1, NULL));
tlv_n1));
assert(!p);
max = tal_count(orig_p); max = tal_count(orig_p);
p = orig_p; p = orig_p;
assert(!fromwire_tlvs(&p, &max, assert((!fromwire_n2(&p, &max, tlv_n2) && !p) ||
tlvs_n2, TLVS_N2_ARRAY_SIZE, !n2_is_valid(tlv_n2, NULL));
tlv_n2));
assert(!p);
} }
} }
@ -573,10 +563,8 @@ int main(void)
p = stream2(tmpctx, valid_streams[j].hex, p = stream2(tmpctx, valid_streams[j].hex,
invalid_streams_n1[i].hex); invalid_streams_n1[i].hex);
max = tal_count(p); max = tal_count(p);
assert(!fromwire_tlvs(&p, &max, assert((!fromwire_n1(&p, &max, tlv_n1) && !p) ||
tlvs_n1, TLVS_N1_ARRAY_SIZE, !n1_is_valid(tlv_n1, NULL));
tlv_n1));
assert(!p);
} }
} }
@ -589,10 +577,8 @@ int main(void)
p = stream2(tmpctx, valid_streams[j].hex, p = stream2(tmpctx, valid_streams[j].hex,
invalid_streams_n1_combo[i].hex); invalid_streams_n1_combo[i].hex);
max = tal_count(p); max = tal_count(p);
assert(!fromwire_tlvs(&p, &max, assert((!fromwire_n1(&p, &max, tlv_n1) && !p) ||
tlvs_n1, TLVS_N1_ARRAY_SIZE, !n1_is_valid(tlv_n1, NULL));
tlv_n1));
assert(!p);
} }
} }
@ -621,9 +607,8 @@ int main(void)
expect_success = pull_type(valid_streams[i].hex) expect_success = pull_type(valid_streams[i].hex)
< pull_type(valid_streams[j].hex); < pull_type(valid_streams[j].hex);
assert(fromwire_tlvs(&p, &max, assert(fromwire_n1(&p, &max, tlv_n1) &&
tlvs_n1, TLVS_N1_ARRAY_SIZE, n1_is_valid(tlv_n1, NULL) == expect_success);
tlv_n1) == expect_success);
if (!expect_success) if (!expect_success)
continue; continue;