lnwire+netann: update ChannelAnnouncement2 structure

Such that all fields are now TLV (including the signature).

netann/channel_announcement.go

@@ -203,7 +203,7 @@ func validateChannelAnn2(a *lnwire.ChannelAnnouncement2,
 		return err
 	}
 
-	sig, err := a.Signature.ToSignature()
+	sig, err := a.Signature.Val.ToSignature()
 	if err != nil {
 		return err
 	}
@@ -278,7 +278,7 @@ func validateChannelAnn2(a *lnwire.ChannelAnnouncement2,
 func ChanAnn2DigestToSign(a *lnwire.ChannelAnnouncement2) (*chainhash.Hash,
 	error) {
 
-	data, err := a.DataToSign()
+	data, err := lnwire.SerialiseFieldsToSign(a)
 	if err != nil {
 		return nil, err
 	}

netann/channel_announcement_test.go

@@ -159,7 +159,7 @@ func test4of4MuSig2ChanAnnouncement(t *testing.T) {
 	sig, err := lnwire.NewSigFromSignature(s)
 	require.NoError(t, err)
 
-	ann.Signature = sig
+	ann.Signature.Val = sig
 
 	// Validate the announcement.
 	require.NoError(t, ValidateChannelAnn(ann, nil))
@@ -259,7 +259,7 @@ func test3of3MuSig2ChanAnnouncement(t *testing.T) {
 	sig, err := lnwire.NewSigFromSignature(s)
 	require.NoError(t, err)
 
-	ann.Signature = sig
+	ann.Signature.Val = sig
 
 	// Validate the announcement.
 	require.NoError(t, ValidateChannelAnn(ann, fetchTx))