From 892a413be36a2a82a8dd3bee32546d214bb61fa3 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Tue, 24 Apr 2018 21:08:19 -0700 Subject: [PATCH] rpc: update SubscribeInvoices to send backlog ntfns, also send add ntfns --- rpcserver.go | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/rpcserver.go b/rpcserver.go index a1693054..df512269 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -2854,14 +2854,24 @@ func (r *rpcServer) ListInvoices(ctx context.Context, func (r *rpcServer) SubscribeInvoices(req *lnrpc.InvoiceSubscription, updateStream lnrpc.Lightning_SubscribeInvoicesServer) error { - invoiceClient := r.server.invoices.SubscribeNotifications() + invoiceClient := r.server.invoices.SubscribeNotifications( + req.AddIndex, req.SettleIndex, + ) defer invoiceClient.Cancel() for { select { - // TODO(roasbeef): include newly added invoices? - case settledInvoice := <-invoiceClient.SettledInvoices: + case newInvoice := <-invoiceClient.NewInvoices: + rpcInvoice, err := createRPCInvoice(newInvoice) + if err != nil { + return err + } + if err := updateStream.Send(rpcInvoice); err != nil { + return err + } + + case settledInvoice := <-invoiceClient.SettledInvoices: rpcInvoice, err := createRPCInvoice(settledInvoice) if err != nil { return err