generate: Fix encoding of table length field

generate/generate.go

@@ -347,8 +347,8 @@ func (this *Generator) generateEncodeValue(typ Type, valueSource, tagSource stri
 	case TypeTableDefined:
 		// KTV: <length: UN> (<key: U16> <tag: Tag> <value>)*
 		nn, err := this.iprintf(
-			"nn, err = encoder.WriteUintN(uint64(%s.CN()), %d)\n",
-			tagSource, len(typ.Fields))
+			"nn, err = encoder.WriteUintN(%d, %s.CN())\n",
+			len(typ.Fields), tagSource)
 		n += nn; if err != nil { return n, err }
 		nn, err = this.generateErrorCheck()
 		n += nn; if err != nil { return n, err }

generate/generate_test.go

@@ -231,9 +231,9 @@ func TestGenerateRun(test *testing.T) {
 		}
 		testEncode(
 			&messageConnect,
-			tu.S(0xC1).AddVar(
-				[]byte { 0x00, 0x00, 0x66, 'r', 'a', 'r', 'i', 't', 'y' }, // TODO tag and payload
-				[]byte { 0x00, 0x01, 0x64, 'g', 'e', 'm', 's' }, // TODO tag and payload
+			tu.S(0xC1, 0x02).AddVar(
+				[]byte { 0x00, 0x00, 0x66, 'r', 'a', 'r', 'i', 't', 'y' },
+				[]byte { 0x00, 0x01, 0x64, 'g', 'e', 'm', 's' },
 				))
 	`)
 }