From 7f5ba35e95537b4ac3bbcc262be998b565a3f3bb Mon Sep 17 00:00:00 2001
From: lisa neigut <niftynei@gmail.com>
Date: Sat, 20 Jul 2019 22:59:57 -0500
Subject: [PATCH] bolt-gen-tests: namespace test tlv's under test_

for posterity.
---
 tools/test/run-test-wire.c |  6 +--
 tools/test/test_cases      | 76 +++++++++++++++++++-------------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/tools/test/run-test-wire.c b/tools/test/run-test-wire.c
index 5a3c58ee0..f7ac4ba67 100644
--- a/tools/test/run-test-wire.c
+++ b/tools/test/run-test-wire.c
@@ -36,9 +36,9 @@ int main(void)
 	setup_locale();
 	void *ctx = tal(NULL, char);
 
-	struct tlv_n1 *n1 = tlv_n1_new(ctx);
-	struct tlv_n2 *n2 = tlv_n2_new(ctx);
-	struct tlv_n3 *n3 = tlv_n3_new(ctx);
+	struct tlv_test_n1 *n1 = tlv_test_n1_new(ctx);
+	struct tlv_test_n2 *n2 = tlv_test_n2_new(ctx);
+	struct tlv_test_n3 *n3 = tlv_test_n3_new(ctx);
 
 	assert(n1);
 	assert(n2);
diff --git a/tools/test/test_cases b/tools/test/test_cases
index 189b71bd8..1eda0352f 100644
--- a/tools/test/test_cases
+++ b/tools/test/test_cases
@@ -43,13 +43,13 @@ msgdata,test_msg,test_sbt_arrays,subtype_arrays,
 
 msgtype,test_tlv1,2
 msgdata,test_tlv1,test_struct,test_short_id,
-msgdata,test_tlv1,tlv,n1,
+msgdata,test_tlv1,tlv,test_n1,
 
 msgtype,test_tlv2,3
-msgdata,test_tlv2,tlv,n2,
+msgdata,test_tlv2,tlv,test_n2,
 
 msgtype,test_tlv3,4
-msgdata,test_tlv3,tlv,n3,
+msgdata,test_tlv3,tlv,test_n3,
 
 # A subtype with a nested subtype
 subtype,subtype_nested
@@ -95,41 +95,41 @@ subtypedata,test_features,len_gf,u16,
 subtypedata,test_features,globalfeatures,u8,len_gf
 
 # TLV's!
-tlvtype,n1,tlv1,1
+tlvtype,test_n1,tlv1,1
 # a truncated u64
-tlvdata,n1,tlv1,amount_msat,tu64,
-tlvtype,n1,tlv2,2
+tlvdata,test_n1,tlv1,amount_msat,tu64,
+tlvtype,test_n1,tlv2,2
 # neseted subtype
-tlvdata,n1,tlv2,scid,test_short_id,
-tlvtype,n1,tlv3,3
-tlvdata,n1,tlv3,features,test_features,
-tlvdata,n1,tlv3,amount_msat_1,u64,
-tlvdata,n1,tlv3,amount_msat_2,u64,
-tlvtype,n1,tlv4,254
-tlvdata,n1,tlv4,cltv_delta,u16,
-tlvtype,n2,tlv1,0
-tlvdata,n2,tlv1,amount_msat,tu64,
-tlvtype,n2,tlv2,11
-tlvdata,n2,tlv2,cltv_expiry,tu32,
-# TLV with all varsized and array structs
-tlvtype,n3,tlv3,1
-tlvdata,n3,tlv3,subtype,test_short_id,
-tlvdata,n3,tlv3,varlen_subtype,subtype_var_len,
-tlvdata,n3,tlv3,varlen_assigned,subtype_var_assign,
-tlvdata,n3,tlv3,test_sbt_varlen_varsize,subtype_varlen_varsize,
-# array assignable
-tlvdata,n3,tlv3,arr_assign,u32,2
+tlvdata,test_n1,tlv2,scid,test_short_id,
+tlvtype,test_n1,tlv3,3
+tlvdata,test_n1,tlv3,features,test_features,
+tlvdata,test_n1,tlv3,amount_msat_1,u64,
+tlvdata,test_n1,tlv3,amount_msat_2,u64,
+tlvtype,test_n1,tlv4,254
+tlvdata,test_n1,tlv4,cltv_delta,u16,
+tlvtype,test_n2,tlv1,0
+tlvdata,test_n2,tlv1,amount_msat,tu64,
+tlvtype,test_n2,tlv2,11
+tlvdata,test_n2,tlv2,cltv_expiry,tu32,
+# TLV with all varsized atest_nd array structs
+tlvtype,test_n3,tlv3,1
+tlvdata,test_n3,tlv3,subtype,test_short_id,
+tlvdata,test_n3,tlv3,varlen_subtype,subtype_var_len,
+tlvdata,test_n3,tlv3,varlen_assigned,subtype_var_assign,
+tlvdata,test_n3,tlv3,test_sbt_varlen_varsize,subtype_varlen_varsize,
+# array assigtest_nable
+tlvdata,test_n3,tlv3,arr_assign,u32,2
 # array structs
-tlvdata,n3,tlv3,arr_struct,test_short_id,2
-# varlen assignable (helper)
-tlvdata,n3,tlv3,len_lf,u16,
-tlvdata,n3,tlv3,localfeatures,u8,len_lf
-# varlen assignable (no-helper)
-tlvdata,n3,tlv3,len_varlen_ass,u16,
-tlvdata,n3,tlv3,varlen_ass,u64,len_varlen_ass
-# varlen structs
-tlvdata,n3,tlv3,len_varlen,u8,
-tlvdata,n3,tlv3,varlen_struct,test_short_id,len_varlen
-# varlen varsized structs
-tlvdata,n3,tlv3,len_varlenvarsize,u8,
-tlvdata,n3,tlv3,varlen_varsize,test_features,len_varlenvarsize
+tlvdata,test_n3,tlv3,arr_struct,test_short_id,2
+# varletest_n assignable (helper)
+tlvdata,test_n3,tlv3,len_lf,u16,
+tlvdata,test_n3,tlv3,localfeatures,u8,len_lf
+# varletest_n assignable (no-helper)
+tlvdata,test_n3,tlv3,len_varlen_ass,u16,
+tlvdata,test_n3,tlv3,varlen_ass,u64,len_varlen_ass
+# varletest_n structs
+tlvdata,test_n3,tlv3,len_varlen,u8,
+tlvdata,test_n3,tlv3,varlen_struct,test_short_id,len_varlen
+# varletest_n varsized structs
+tlvdata,test_n3,tlv3,len_varlenvarsize,u8,
+tlvdata,test_n3,tlv3,varlen_varsize,test_features,len_varlenvarsize