aljaz/lndhub.go
1
1
Fork 0
mirror of https://github.com/getAlby/lndhub.go.git synced 2025-12-23 15:44:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

already processed keysend -> no error

Browse Source
This commit is contained in:
kiwiidb
2023-04-01 15:15:18 +02:00
parent 2af71fe66b
commit 940dc5ac09
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/service/invoicesubscription.go
View File

@@ -93,6 +93,9 @@ func (svc *LndhubService) ProcessInvoiceUpdate(ctx context.Context, rawInvoice *
if rawInvoice.IsKeysend { if rawInvoice.IsKeysend {
err := svc.HandleKeysendPayment(ctx, rawInvoice) err := svc.HandleKeysendPayment(ctx, rawInvoice)
if err != nil { if err != nil {
if err == AlreadyProcessedKeysendError {
return nil
}
return err return err
} }
} }

16
rabbitmq/rabbitmq.go
View File

@@ -31,14 +31,14 @@ const (
) )
type ( type (
InvoiceHandler = func(ctx context.Context, invoice *lnrpc.Invoice) error IncomingInvoiceHandler = func(ctx context.Context, invoice *lnrpc.Invoice) error
SubscribeToInvoicesFunc = func() (in chan models.Invoice, out chan models.Invoice, err error) SubscribeToInvoicesFunc = func() (in chan models.Invoice, out chan models.Invoice, err error)
EncodeInvoicePayloadFunc = func(ctx context.Context, w io.Writer, invoice models.Invoice) error EncodeOutgoingInvoiceFunc = func(ctx context.Context, w io.Writer, invoice models.Invoice) error
) )
type Client interface { type Client interface {
SubscribeToLndInvoices(context.Context, InvoiceHandler) error SubscribeToLndInvoices(context.Context, IncomingInvoiceHandler) error
StartPublishInvoices(context.Context, SubscribeToInvoicesFunc, EncodeInvoicePayloadFunc) error StartPublishInvoices(context.Context, SubscribeToInvoicesFunc, EncodeOutgoingInvoiceFunc) error
// Close will close all connections to rabbitmq // Close will close all connections to rabbitmq
Close() error Close() error
} }
@@ -128,7 +128,7 @@ func Dial(uri string, options ...ClientOption) (Client, error) {
func (client *DefaultClient) Close() error { return client.conn.Close() } func (client *DefaultClient) Close() error { return client.conn.Close() }
func (client *DefaultClient) SubscribeToLndInvoices(ctx context.Context, handler InvoiceHandler) error { func (client *DefaultClient) SubscribeToLndInvoices(ctx context.Context, handler IncomingInvoiceHandler) error {
err := client.publishChannel.ExchangeDeclare( err := client.publishChannel.ExchangeDeclare(
client.lndInvoiceExchange, client.lndInvoiceExchange,
// topic is a type of exchange that allows routing messages to different queue's bases on a routing key // topic is a type of exchange that allows routing messages to different queue's bases on a routing key
@@ -169,7 +169,7 @@ func (client *DefaultClient) SubscribeToLndInvoices(ctx context.Context, handler
err = client.consumeChannel.QueueBind( err = client.consumeChannel.QueueBind(
queue.Name, queue.Name,
"#", "invoice.incoming.settled",
client.lndInvoiceExchange, client.lndInvoiceExchange,
// Nowait: We set this to false as we want to wait for a server response // Nowait: We set this to false as we want to wait for a server response
// to check whether the queue was created successfully // to check whether the queue was created successfully
@@ -239,7 +239,7 @@ func (client *DefaultClient) SubscribeToLndInvoices(ctx context.Context, handler
} }
} }
func (client *DefaultClient) StartPublishInvoices(ctx context.Context, invoicesSubscribeFunc SubscribeToInvoicesFunc, payloadFunc EncodeInvoicePayloadFunc) error { func (client *DefaultClient) StartPublishInvoices(ctx context.Context, invoicesSubscribeFunc SubscribeToInvoicesFunc, payloadFunc EncodeOutgoingInvoiceFunc) error {
err := client.publishChannel.ExchangeDeclare( err := client.publishChannel.ExchangeDeclare(
client.lndHubInvoiceExchange, client.lndHubInvoiceExchange,
// topic is a type of exchange that allows routing messages to different queue's bases on a routing key // topic is a type of exchange that allows routing messages to different queue's bases on a routing key
@@ -286,7 +286,7 @@ func (client *DefaultClient) StartPublishInvoices(ctx context.Context, invoicesS
} }
} }
func (client *DefaultClient) publishToLndhubExchange(ctx context.Context, invoice models.Invoice, payloadFunc EncodeInvoicePayloadFunc) error { func (client *DefaultClient) publishToLndhubExchange(ctx context.Context, invoice models.Invoice, payloadFunc EncodeOutgoingInvoiceFunc) error {
payload := bufPool.Get().(*bytes.Buffer) payload := bufPool.Get().(*bytes.Buffer)
err := payloadFunc(ctx, payload, invoice) err := payloadFunc(ctx, payload, invoice)
if err != nil { if err != nil {