spec: remove encoding byte from checksums.

Make the TLV element a simple array.  This is a bit neater, in fact, and
makes the test vectors in that 557 PR work.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

gossipd/gossipd.c

@@ -91,8 +91,7 @@ struct tlv_reply_channel_range_tlvs_timestamps_tlv {
 };
 
 struct tlv_reply_channel_range_tlvs_checksums_tlv {
-        u8 encoding_type;
+        struct channel_update_checksums *checksums;
-        u8 *encoded_checksums;
 };
 
 struct channel_update_timestamps {
@@ -104,12 +103,6 @@ struct channel_update_checksums {
         u32 checksum_node_id_2;
 };
 
-static void towire_channel_update_checksums(u8 **p,
-					    const struct channel_update_checksums *channel_update_checksums)
-{
-	abort();
-}
-
 static void towire_channel_update_timestamps(u8 **p,
 					     const struct channel_update_timestamps *channel_update_timestamps)
 {
@@ -316,13 +309,6 @@ static void encoding_add_timestamps(u8 **encoded,
 	towire_channel_update_timestamps(encoded, ts);
 }
 
-/* Marshal a single channel_update_checksums */
-static void encoding_add_checksums(u8 **encoded,
-				   const struct channel_update_checksums *csums)
-{
-	towire_channel_update_checksums(encoded, csums);
-}
-
 /* Marshal a single query flag (we don't query, so not currently used) */
 static UNNEEDED void encoding_add_query_flag(u8 **encoded, bigsize_t flag)
 {
@@ -1074,7 +1060,8 @@ static bool queue_channel_ranges(struct peer *peer,
 	if (query_option_flags & QUERY_ADD_CHECKSUMS) {
 		csums = tal(tmpctx,
 			    struct tlv_reply_channel_range_tlvs_checksums_tlv);
-		csums->encoded_checksums = encoding_start(csums);
+		csums->checksums
+			= tal_arr(csums, struct channel_update_checksums, 0);
 	} else
 		csums = NULL;
 
@@ -1113,7 +1100,7 @@ static bool queue_channel_ranges(struct peer *peer,
 					   &cs.checksum_node_id_2);
 
 		if (csums)
-			encoding_add_checksums(&csums->encoded_checksums, &cs);
+			tal_arr_expand(&csums->checksums, cs);
 		if (tstamps)
 			encoding_add_timestamps(&tstamps->encoded_timestamps,
 						&ts);
@@ -1124,12 +1111,7 @@ static bool queue_channel_ranges(struct peer *peer,
 	/* If either of these can't fit in max_encoded_bytes by itself,
 	 * it's over. */
 	if (csums) {
-		if (!encoding_end_external_type(&csums->encoded_checksums,
+		extension_bytes += tlv_len(csums->checksums);
-						&csums->encoding_type,
-						max_encoded_bytes))
-			goto wont_fit;
-		/* 1 byte for encoding_type, too */
-		extension_bytes += 1 + tlv_len(csums->encoded_checksums);
 	}
 
 	if (tstamps) {

wire/extracted_peer_experimental_csv

@@ -23,7 +23,7 @@
  msgtype,reply_channel_range,264,gossip_queries
  msgdata,reply_channel_range,chain_hash,chain_hash,
  msgdata,reply_channel_range,first_blocknum,u32,
-@@ -168,6 +189,20 @@
+@@ -168,6 +189,19 @@
  msgdata,reply_channel_range,complete,byte,
  msgdata,reply_channel_range,len,u16,
  msgdata,reply_channel_range,encoded_short_ids,byte,len
@@ -33,8 +33,7 @@
 +tlvdata,reply_channel_range_tlvs,timestamps_tlv,encoding_type,byte,
 +tlvdata,reply_channel_range_tlvs,timestamps_tlv,encoded_timestamps,byte,...
 +tlvtype,reply_channel_range_tlvs,checksums_tlv,3
-+tlvdata,reply_channel_range_tlvs,checksums_tlv,encoding_type,byte,
++tlvdata,reply_channel_range_tlvs,checksums_tlv,checksums,channel_update_checksums,...
-+tlvdata,reply_channel_range_tlvs,checksums_tlv,encoded_checksums,byte,...
 +subtype,channel_update_timestamps
 +subtypedata,channel_update_timestamps,timestamp_node_id_1,u32,
 +subtypedata,channel_update_timestamps,timestamp_node_id_2,u32,