WIP

Author: ffranr

rfqmsg/accept.go

@@ -149,23 +149,25 @@ type Accept struct {
 	acceptMsgData
 }
 
-// NewAcceptMsg creates a new instance of a quote accept message.
-func NewAcceptMsg(peer route.Vertex, id ID, askingPrice lnwire.MilliSatoshi,
+// NewAcceptFromRequest creates a new instance of a quote accept message given
+// a quote request message.
+func NewAcceptFromRequest(request Request, askingPrice lnwire.MilliSatoshi,
 	expiry uint64, sig [64]byte) Accept {
 
 	return Accept{
-		Peer: peer,
+		Peer:        request.Peer,
+		AssetAmount: request.AssetAmount,
 		acceptMsgData: acceptMsgData{
-			ID:          id,
-			AskingPrice: lnwire.MilliSatoshi(askingPrice),
+			ID:          request.ID,
+			AskingPrice: askingPrice,
 			Expiry:      expiry,
 			sig:         sig,
 		},
 	}
 }
 
-// NewQuoteAcceptFromWireMsg instantiates a new instance from a wire message.
-func NewQuoteAcceptFromWireMsg(wireMsg WireMessage) (*Accept, error) {
+// NewAcceptFromWireMsg instantiates a new instance from a wire message.
+func NewAcceptFromWireMsg(wireMsg WireMessage) (*Accept, error) {
 	// Decode message data component from TLV bytes.
 	var msgData acceptMsgData
 	err := msgData.Decode(bytes.NewReader(wireMsg.Data))

rfqservice/negotiator.go

@@ -68,12 +68,14 @@ func (n *Negotiator) queryPriceOracle(
 
 // handlePriceOracleResponse handles the response from the price oracle.
 func (n *Negotiator) handlePriceOracleResponse(
-	req rfqmsg.Request, res *PriceOracleSuggestedRate) error {
+	request rfqmsg.Request, oracleResponse *PriceOracleSuggestedRate) error {
 
 	// If the suggested rate is nil, then we will return the error message
 	// supplied by the price oracle.
-	if res.AskingPrice == nil {
-		rejectMsg := rfqmsg.NewRejectMsg(req.Peer, req.ID, res.Err)
+	if oracleResponse.AskingPrice == nil {
+		rejectMsg := rfqmsg.NewRejectMsg(
+			request.Peer, request.ID, oracleResponse.Err,
+		)
 		var msg rfqmsg.OutgoingMsg = &rejectMsg
 
 		sendSuccess := fn.SendOrQuit(n.outgoingMessages, msg, n.Quit)
@@ -86,8 +88,8 @@ func (n *Negotiator) handlePriceOracleResponse(
 	// If the suggested rate is not nil, then we can proceed to respond
 	// with an accept message.
 	var sig [64]byte
-	acceptMsg := rfqmsg.NewAcceptMsg(
-		req.Peer, req.ID, *res.AskingPrice, res.Expiry, sig,
+	acceptMsg := rfqmsg.NewAcceptFromRequest(
+		request, *oracleResponse.AskingPrice, oracleResponse.Expiry, sig,
 	)
 	var msg rfqmsg.OutgoingMsg = &acceptMsg
 

rfqservice/order.go

@@ -34,15 +34,13 @@ type ChannelRemit struct {
 }
 
 // NewChannelRemit creates a new channel remit.
-func NewChannelRemit(assetAmount uint64,
-	quoteAccept rfqmsg.Accept) (*ChannelRemit, error) {
-
+func NewChannelRemit(quoteAccept rfqmsg.Accept) (*ChannelRemit, error) {
 	// Compute the serialised short channel ID (SCID) for the channel.
 	scid := SerialisedScid(quoteAccept.ShortChannelId())
 
 	return &ChannelRemit{
 		Scid:                  scid,
-		AssetAmount:           assetAmount,
+		AssetAmount:           quoteAccept.AssetAmount,
 		MinimumChannelPayment: quoteAccept.AskingPrice,
 		Expiry:                quoteAccept.Expiry,
 	}, nil
@@ -227,10 +225,8 @@ func (h *OrderHandler) Start() error {
 
 // RegisterChannelRemit registers a channel management remit. If a remit exists
 // for the channel SCID, it is overwritten.
-func (h *OrderHandler) RegisterChannelRemit(assetAmount uint64,
-	quoteAccept rfqmsg.Accept) error {
-
-	channelRemit, err := NewChannelRemit(assetAmount, quoteAccept)
+func (h *OrderHandler) RegisterChannelRemit(quoteAccept rfqmsg.Accept) error {
+	channelRemit, err := NewChannelRemit(quoteAccept)
 	if err != nil {
 		return fmt.Errorf("unable to create channel remit: %w", err)
 	}

rfqservice/rfq.go

@@ -236,7 +236,7 @@ func (m *Manager) handleOutgoingMessage(outgoingMsg rfqmsg.OutgoingMsg) error {
 	case *rfqmsg.Accept:
 		// Inform the HTLC order handler that we've accepted the quote request.
 		// TODO(ffranr): set the asset amount correctly
-		err := m.orderHandler.RegisterChannelRemit(42, *msg)
+		err := m.orderHandler.RegisterChannelRemit(*msg)
 		if err != nil {
 			return fmt.Errorf("error registering channel remit: %w", err)
 		}

rfqservice/stream.go

@@ -106,7 +106,7 @@ func (h *StreamHandler) handleIncomingQuoteRequest(
 func (h *StreamHandler) handleIncomingQuoteAccept(
 	wireMsg rfqmsg.WireMessage) error {
 
-	quoteAccept, err := rfqmsg.NewQuoteAcceptFromWireMsg(wireMsg)
+	quoteAccept, err := rfqmsg.NewAcceptFromWireMsg(wireMsg)
 	if err != nil {
 		return fmt.Errorf("unable to create a quote accept message "+
 			"from a lndclient custom message: %w", err)