wire-mix: more max count error formatting

decred · Nov 21, 2023 · 6693718 · 6693718
1 parent 47d8312
commit 6693718
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 12 deletions.
diff --git a/wire/msgmixct.go b/wire/msgmixct.go
@@ -46,7 +46,8 @@ func (msg *MsgMixCT) BtcDecode(r io.Reader, pver uint32) error {
 		return err
 	}
 	if count > MaxPrevMixMsgs {
-		msg := fmt.Sprintf("too many previous referenced messages [%v]", count)
+		msg := fmt.Sprintf("too many previous referenced messages [count %v, max %v]",
+			count, MaxPrevMixMsgs)
 		return messageError(op, ErrTooManyPrevMixMsgs, msg)
 	}
 

diff --git a/wire/msgmixdc.go b/wire/msgmixdc.go
@@ -43,7 +43,8 @@ func (msg *MsgMixDC) BtcDecode(r io.Reader, pver uint32) error {
 		return err
 	}
 	if mcount > MaxMixMcount {
-		msg := fmt.Sprintf("too many total mixed messages [%v]", mcount)
+		msg := fmt.Sprintf("too many total mixed messages [count %v, max %v]",
+			mcount, MaxMixMcount)
 		return messageError(op, ErrInvalidMsg, msg)
 	}
 
@@ -61,7 +62,8 @@ func (msg *MsgMixDC) BtcDecode(r io.Reader, pver uint32) error {
 		return err
 	}
 	if count > MaxPrevMixMsgs {
-		msg := fmt.Sprintf("too many previous referenced messages [%v]", count)
+		msg := fmt.Sprintf("too many previous referenced messages [count %v, max %v]",
+			count, MaxPrevMixMsgs)
 		return messageError(op, ErrTooManyPrevMixMsgs, msg)
 	}
 

diff --git a/wire/msgmixke.go b/wire/msgmixke.go
@@ -54,7 +54,8 @@ func (msg *MsgMixKE) BtcDecode(r io.Reader, pver uint32) error {
 		return err
 	}
 	if count > MaxPrevMixMsgs {
-		msg := fmt.Sprintf("too many previous referenced messages [%v]", count)
+		msg := fmt.Sprintf("too many previous referenced messages [count %v, max %v]",
+			count, MaxPrevMixMsgs)
 		return messageError(op, ErrTooManyPrevMixMsgs, msg)
 	}
 

diff --git a/wire/msgmixpr.go b/wire/msgmixpr.go
@@ -120,7 +120,8 @@ func (msg *MsgMixPR) BtcDecode(r io.Reader, pver uint32) error {
 		return err
 	}
 	if count > MaxMixPRUTXOs {
-		msg := fmt.Sprintf("too many UTXOs in message [%v]", count)
+		msg := fmt.Sprintf("too many UTXOs in message [count %v, max %v]",
+			count, MaxMixPRUTXOs)
 		return messageError(op, ErrTooManyMixPRUTXOs, msg)
 	}
 	utxos := make([]MixPRUTXO, count)
@@ -240,7 +241,8 @@ func (msg *MsgMixPR) writeMessageNoSignature(op string, w io.Writer, pver uint32
 		}
 
 		if l := len(utxo.Script); l > MaxMixPRUTXOScriptLen {
-			msg := fmt.Sprintf("UTXO script is too long [%v]", l)
+			msg := fmt.Sprintf("UTXO script is too long [len %v, max %v]",
+				l, MaxMixPRUTXOScriptLen)
 			return messageError(op, ErrVarBytesTooLong, msg)
 		}
 		err = WriteVarBytes(w, pver, utxo.Script)
@@ -249,7 +251,8 @@ func (msg *MsgMixPR) writeMessageNoSignature(op string, w io.Writer, pver uint32
 		}
 
 		if l := len(utxo.PubKey); l > MaxMixPRUTXOPubKeyLen {
-			msg := fmt.Sprintf("UTXO public key is too long [%v]", l)
+			msg := fmt.Sprintf("UTXO public key is too long [len %v, max %v]",
+				l, MaxMixPRUTXOPubKeyLen)
 			return messageError(op, ErrVarBytesTooLong, msg)
 		}
 		err = WriteVarBytes(w, pver, utxo.PubKey)
@@ -258,7 +261,8 @@ func (msg *MsgMixPR) writeMessageNoSignature(op string, w io.Writer, pver uint32
 		}
 
 		if l := len(utxo.Signature); l > MaxMixPRUTXOSignatureLen {
-			msg := fmt.Sprintf("UTXO signature is too long [%v]", l)
+			msg := fmt.Sprintf("UTXO signature is too long [len %v, max %v]",
+				l, MaxMixPRUTXOSignatureLen)
 			return messageError(op, ErrVarBytesTooLong, msg)
 		}
 		err = WriteVarBytes(w, pver, utxo.Signature)

diff --git a/wire/msgmixrs.go b/wire/msgmixrs.go
@@ -49,7 +49,8 @@ func (msg *MsgMixRS) BtcDecode(r io.Reader, pver uint32) error {
 		return err
 	}
 	if numSRs > MaxMixMcount {
-		msg := fmt.Sprintf("too many total mixed messages [%v]", numSRs)
+		msg := fmt.Sprintf("too many total mixed messages [count %v, max %v]",
+			numSRs, MaxMixMcount)
 		return messageError(op, ErrInvalidMsg, msg)
 	}
 	msg.SR = make([][]byte, numSRs)
@@ -67,7 +68,8 @@ func (msg *MsgMixRS) BtcDecode(r io.Reader, pver uint32) error {
 		return err
 	}
 	if numMs > MaxMixMcount {
-		msg := fmt.Sprintf("too many total mixed messages [%v]", numMs)
+		msg := fmt.Sprintf("too many total mixed messages [count %v, max %v]",
+			numMs, MaxMixMcount)
 		return messageError(op, ErrInvalidMsg, msg)
 	}
 	msg.M = make([][]byte, numMs)

diff --git a/wire/msgmixsr.go b/wire/msgmixsr.go
@@ -77,7 +77,8 @@ func (msg *MsgMixSR) BtcDecode(r io.Reader, pver uint32) error {
 		return messageError(op, ErrInvalidMsg, msg)
 	}
 	if kpcount > MaxMixKPCount {
-		msg := fmt.Sprintf("too many mixing peers [%v]", kpcount)
+		msg := fmt.Sprintf("too many mixing peers [count %v, max %v]",
+			kpcount, MaxMixKPCount)
 		return messageError(op, ErrInvalidMsg, msg)
 	}
 	dcmix := make([][][]byte, mcount)
@@ -98,7 +99,8 @@ func (msg *MsgMixSR) BtcDecode(r io.Reader, pver uint32) error {
 		return err
 	}
 	if count > MaxPrevMixMsgs {
-		msg := fmt.Sprintf("too many previous referenced messages [%v]", count)
+		msg := fmt.Sprintf("too many previous referenced messages [count %v, max %v]",
+			count, MaxPrevMixMsgs)
 		return messageError(op, ErrTooManyPrevMixMsgs, msg)
 	}