lnwire: move message prefixing to the harness

The prefixing is done every time the harness is used, so it may as well
reside in the harness itself.

lnwire/fuzz_test.go

@@ -24,9 +24,11 @@ func prefixWithMsgType(data []byte, prefix MessageType) []byte {
 // message. This function will check that the passed-in message passes wire
 // length checks, is a valid message once deserialized, and passes a sequence of
 // serialization and deserialization checks.
-func wireMsgHarness(t *testing.T, data []byte) {
+func wireMsgHarness(t *testing.T, data []byte, msgType MessageType) {
 	t.Helper()
 
+	data = prefixWithMsgType(data, msgType)
+
 	// Create a reader with the byte array.
 	r := bytes.NewReader(data)
 
@@ -105,22 +107,19 @@ func FuzzAcceptChannel(f *testing.F) {
 
 func FuzzAnnounceSignatures(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgAnnounceSignatures)
+		wireMsgHarness(t, data, MsgAnnounceSignatures)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzAnnounceSignatures2(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgAnnounceSignatures2)
+		wireMsgHarness(t, data, MsgAnnounceSignatures2)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzChannelAnnouncement(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgChannelAnnouncement)
+		wireMsgHarness(t, data, MsgChannelAnnouncement)
-		wireMsgHarness(t, data)
 	})
 }
 
@@ -170,92 +169,79 @@ func FuzzChannelAnnouncement2(f *testing.F) {
 
 func FuzzChannelReestablish(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgChannelReestablish)
+		wireMsgHarness(t, data, MsgChannelReestablish)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzChannelUpdate(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgChannelUpdate)
+		wireMsgHarness(t, data, MsgChannelUpdate)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzChannelUpdate2(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgChannelUpdate2)
+		wireMsgHarness(t, data, MsgChannelUpdate2)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzClosingSigned(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgClosingSigned)
+		wireMsgHarness(t, data, MsgClosingSigned)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzCommitSig(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgCommitSig)
+		wireMsgHarness(t, data, MsgCommitSig)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzError(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgError)
+		wireMsgHarness(t, data, MsgError)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzWarning(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgWarning)
+		wireMsgHarness(t, data, MsgWarning)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzStfu(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgStfu)
+		wireMsgHarness(t, data, MsgStfu)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzFundingCreated(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgFundingCreated)
+		wireMsgHarness(t, data, MsgFundingCreated)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzChannelReady(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgChannelReady)
+		wireMsgHarness(t, data, MsgChannelReady)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzFundingSigned(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgFundingSigned)
+		wireMsgHarness(t, data, MsgFundingSigned)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzGossipTimestampRange(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgGossipTimestampRange)
+		wireMsgHarness(t, data, MsgGossipTimestampRange)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzInit(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgInit)
+		wireMsgHarness(t, data, MsgInit)
-		wireMsgHarness(t, data)
 	})
 }
 
@@ -373,22 +359,19 @@ func FuzzOpenChannel(f *testing.F) {
 
 func FuzzPing(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgPing)
+		wireMsgHarness(t, data, MsgPing)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzPong(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgPong)
+		wireMsgHarness(t, data, MsgPong)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzQueryChannelRange(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgQueryChannelRange)
+		wireMsgHarness(t, data, MsgQueryChannelRange)
-		wireMsgHarness(t, data)
 	})
 }
 
@@ -416,15 +399,13 @@ func FuzzZlibQueryShortChanIDs(f *testing.F) {
 		payload = append(payload, zlibByte...)
 		payload = append(payload, compressedPayload...)
 
-		payload = prefixWithMsgType(payload, MsgQueryShortChanIDs)
+		wireMsgHarness(t, payload, MsgQueryShortChanIDs)
-		wireMsgHarness(t, payload)
 	})
 }
 
 func FuzzQueryShortChanIDs(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgQueryShortChanIDs)
+		wireMsgHarness(t, data, MsgQueryShortChanIDs)
-		wireMsgHarness(t, data)
 	})
 }
 
@@ -460,8 +441,7 @@ func FuzzZlibReplyChannelRange(f *testing.F) {
 		payload = append(payload, zlibByte...)
 		payload = append(payload, compressedPayload...)
 
-		payload = prefixWithMsgType(payload, MsgReplyChannelRange)
+		wireMsgHarness(t, payload, MsgReplyChannelRange)
-		wireMsgHarness(t, payload)
 	})
 }
 
@@ -515,85 +495,73 @@ func FuzzReplyChannelRange(f *testing.F) {
 
 func FuzzReplyShortChanIDsEnd(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgReplyShortChanIDsEnd)
+		wireMsgHarness(t, data, MsgReplyShortChanIDsEnd)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzRevokeAndAck(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgRevokeAndAck)
+		wireMsgHarness(t, data, MsgRevokeAndAck)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzShutdown(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgShutdown)
+		wireMsgHarness(t, data, MsgShutdown)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzUpdateAddHTLC(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgUpdateAddHTLC)
+		wireMsgHarness(t, data, MsgUpdateAddHTLC)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzUpdateFailHTLC(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgUpdateFailHTLC)
+		wireMsgHarness(t, data, MsgUpdateFailHTLC)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzUpdateFailMalformedHTLC(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgUpdateFailMalformedHTLC)
+		wireMsgHarness(t, data, MsgUpdateFailMalformedHTLC)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzUpdateFee(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgUpdateFee)
+		wireMsgHarness(t, data, MsgUpdateFee)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzUpdateFulfillHTLC(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgUpdateFulfillHTLC)
+		wireMsgHarness(t, data, MsgUpdateFulfillHTLC)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzDynPropose(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgDynPropose)
+		wireMsgHarness(t, data, MsgDynPropose)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzDynReject(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgDynReject)
+		wireMsgHarness(t, data, MsgDynReject)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzDynAck(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgDynAck)
+		wireMsgHarness(t, data, MsgDynAck)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzKickoffSig(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgKickoffSig)
+		wireMsgHarness(t, data, MsgKickoffSig)
-		wireMsgHarness(t, data)
 	})
 }
 
@@ -603,8 +571,7 @@ func FuzzCustomMessage(f *testing.F) {
 			customMessageType += uint16(CustomTypeStart)
 		}
 
-		data = prefixWithMsgType(data, MessageType(customMessageType))
+		wireMsgHarness(t, data, MessageType(customMessageType))
-		wireMsgHarness(t, data)
 	})
 }
 
@@ -890,15 +857,13 @@ func FuzzFailInvalidBlinding(f *testing.F) {
 
 func FuzzClosingSig(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgClosingSig)
+		wireMsgHarness(t, data, MsgClosingSig)
-		wireMsgHarness(t, data)
 	})
 }
 
 func FuzzClosingComplete(f *testing.F) {
 	f.Fuzz(func(t *testing.T, data []byte) {
-		data = prefixWithMsgType(data, MsgClosingComplete)
+		wireMsgHarness(t, data, MsgClosingComplete)
-		wireMsgHarness(t, data)
 	})
 }