fixup! multi: endpoints for onion messages

Author: gijswijs

rpcserver.go

@@ -9302,7 +9302,7 @@ func (r *rpcServer) SubscribeCustomMessages(
 }
 
 // SendOnionMessage sends a custom peer message.
-func (r *rpcServer) SendOnionMessage(_ context.Context,
+func (r *rpcServer) SendOnionMessage(ctx context.Context,
 	req *lnrpc.SendOnionMessageRequest) (*lnrpc.SendOnionMessageResponse,
 	error) {
 
@@ -9320,9 +9320,7 @@ func (r *rpcServer) SendOnionMessage(_ context.Context,
 		return nil, err
 	}
 
-	err = r.server.SendOnionMessage(
-		peer, blindingPoint, req.Onion,
-	)
+	err = r.server.SendOnionMessage(ctx, peer, blindingPoint, req.Onion)
 	switch {
 	case errors.Is(err, ErrPeerNotConnected):
 		return nil, status.Error(codes.NotFound, err.Error())

server.go

@@ -5319,21 +5319,24 @@ func (s *server) SendCustomMessage(peerPub [33]byte, msgType lnwire.MessageType,
 // SendOnionMessage sends a custom message to the peer with the specified
 // pubkey.
 // TODO(gijs): change this message to include path finding.
-func (s *server) SendOnionMessage(peerPub [33]byte,
+func (s *server) SendOnionMessage(ctx context.Context, peerPub [33]byte,
 	blindingPoint *btcec.PublicKey, onion []byte) error {
 
 	peer, err := s.FindPeerByPubStr(string(peerPub[:]))
 	if err != nil {
 		return err
 	}
 
-	// We'll wait until the peer is active.
+	// We'll wait until the peer is active, but also listen for
+	// cancellation.
 	select {
 	case <-peer.ActiveSignal():
 	case <-peer.QuitSignal():
 		return fmt.Errorf("peer %x disconnected", peerPub)
 	case <-s.quit:
 		return ErrServerShuttingDown
+	case <-ctx.Done():
+		return ctx.Err()
 	}
 
 	msg := lnwire.NewOnionMessage(blindingPoint, onion)