WIP

Author: ffranr

rfqmessages/quote_request.go

@@ -2,6 +2,7 @@ package rfqmessages
 
 import (
 	"crypto/sha256"
+	"fmt"
 	"io"
 
 	"github.com/btcsuite/btcd/btcec/v2"
@@ -118,6 +119,20 @@ type QuoteRequest struct {
 	SuggestedRateTick uint64
 }
 
+// Validate ensures that the quote request is valid.
+func (q *QuoteRequest) Validate() error {
+	if q.AssetID == nil && q.AssetGroupKey == nil {
+		return fmt.Errorf("asset id and group key cannot both be nil")
+	}
+
+	if q.AssetID != nil && q.AssetGroupKey != nil {
+		return fmt.Errorf("asset id and group key cannot both be " +
+			"non-nil")
+	}
+
+	return nil
+}
+
 // EncodeRecords determines the non-nil records to include when encoding an
 // asset witness at runtime.
 func (q *QuoteRequest) EncodeRecords() []tlv.Record {

rfqservice/stream.go

@@ -71,8 +71,8 @@ func NewStreamHandler(ctx context.Context,
 	}, nil
 }
 
-// handleRecvRawMessage handles an incoming raw peer message.
-func (h *StreamHandler) handleQuoteRequestMsg(
+// handleIncomingRawMessage handles an incoming raw peer message.
+func (h *StreamHandler) handleIncomingQuoteRequestMsg(
 	rawMsg lndclient.CustomMessage) error {
 
 	// Attempt to decode the message as a request for quote (RFQ) message.
@@ -83,6 +83,12 @@ func (h *StreamHandler) handleQuoteRequestMsg(
 			err)
 	}
 
+	// Validate incoming quote request.
+	if err = quoteRequest.Validate(); err != nil {
+		return fmt.Errorf("unable to validate incoming RFQ message: %w",
+			err)
+	}
+
 	// TODO(ffranr): Determine whether to keep or discard the RFQ message
 	//  based on the peer's ID and the asset's ID.
 
@@ -98,13 +104,13 @@ func (h *StreamHandler) handleQuoteRequestMsg(
 	return nil
 }
 
-// handleRecvRawMessage handles an incoming raw peer message.
-func (h *StreamHandler) handleRecvRawMessage(
+// handleIncomingRawMessage handles an incoming raw peer message.
+func (h *StreamHandler) handleIncomingRawMessage(
 	rawMsg lndclient.CustomMessage) error {
 
 	switch rawMsg.MsgType {
 	case msg.MsgTypeQuoteRequest:
-		err := h.handleQuoteRequestMsg(rawMsg)
+		err := h.handleIncomingQuoteRequestMsg(rawMsg)
 		if err != nil {
 			return fmt.Errorf("unable to handle incoming quote "+
 				"request message: %w", err)
@@ -130,8 +136,9 @@ func (h *StreamHandler) Start() error {
 					"channel closed unexpectedly")
 			}
 
-			log.Infof("Received raw custom message: %v", rawMsg)
-			err := h.handleRecvRawMessage(rawMsg)
+			log.Infof("Handling incoming raw custom message: %v",
+				rawMsg)
+			err := h.handleIncomingRawMessage(rawMsg)
 			if err != nil {
 				log.Warnf("Error handling raw custom "+
 					"message recieve event: %v", err)