lnwire: create common encoder/decoder for raw feature vectors

We'll need to pack feature vectors for route blinding, so we pull
the encoding/decoding out into separate functions (currently
contained in ChannelType). Though it's more lines of code, we keep
most of the ChannelType assertions so that we strictly enforce
use of the alias.

lnwire/channel_type.go

@@ -19,7 +19,7 @@ type ChannelType RawFeatureVector
 // featureBitLen returns the length in bytes of the encoded feature bits.
 func (c ChannelType) featureBitLen() uint64 {
 	fv := RawFeatureVector(c)
-	return uint64(fv.SerializeSize())
+	return fv.sizeFunc()
 }
 
 // Record returns a TLV record that can be used to encode/decode the channel
@@ -34,25 +34,27 @@ func (c *ChannelType) Record() tlv.Record {
 // channelTypeEncoder is a custom TLV encoder for the ChannelType record.
 func channelTypeEncoder(w io.Writer, val interface{}, buf *[8]byte) error {
 	if v, ok := val.(*ChannelType); ok {
-		// Encode the feature bits as a byte slice without its length
-		// prepended, as that's already taken care of by the TLV record.
 		fv := RawFeatureVector(*v)
-		return fv.encode(w, fv.SerializeSize(), 8)
+		return rawFeatureEncoder(w, &fv, buf)
 	}
 
-	return tlv.NewTypeForEncodingErr(val, "lnwire.ChannelType")
+	return tlv.NewTypeForEncodingErr(val, "*lnwire.ChannelType")
 }
 
 // channelTypeDecoder is a custom TLV decoder for the ChannelType record.
-func channelTypeDecoder(r io.Reader, val interface{}, buf *[8]byte, l uint64) error {
+func channelTypeDecoder(r io.Reader, val interface{}, buf *[8]byte,
+	l uint64) error {
+
 	if v, ok := val.(*ChannelType); ok {
 		fv := NewRawFeatureVector()
-		if err := fv.decode(r, int(l), 8); err != nil {
+
+		if err := rawFeatureDecoder(r, fv, buf, l); err != nil {
 			return err
 		}
+
 		*v = ChannelType(*fv)
 		return nil
 	}
 
-	return tlv.NewTypeForEncodingErr(val, "lnwire.ChannelType")
+	return tlv.NewTypeForEncodingErr(val, "*lnwire.ChannelType")
 }