akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

invoices: remove redundant state field from invoice event

Browse Source
This commit is contained in:
Joost Jager 2019-08-09 11:41:34 +02:00
parent 9a5ac78912
commit bed2acea33
No known key found for this signature in database
GPG Key ID: A61B9D4C393C59C7
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
invoices/invoiceregistry.go
View File

@ -139,7 +139,6 @@ func (i *InvoiceRegistry) Stop() {
// Only two event types are currently supported: newly created invoices, and // Only two event types are currently supported: newly created invoices, and
// instance where invoices are settled. // instance where invoices are settled.
type invoiceEvent struct { type invoiceEvent struct {
state channeldb.ContractState
hash lntypes.Hash hash lntypes.Hash
invoice *channeldb.Invoice invoice *channeldb.Invoice
} }
@ -204,8 +203,9 @@ func (i *InvoiceRegistry) invoiceEventNotifier() {
case event := <-i.invoiceEvents: case event := <-i.invoiceEvents:
// For backwards compatibility, do not notify all // For backwards compatibility, do not notify all
// invoice subscribers of cancel and accept events. // invoice subscribers of cancel and accept events.
if event.state != channeldb.ContractCanceled && state := event.invoice.Terms.State
event.state != channeldb.ContractAccepted { if state != channeldb.ContractCanceled &&
state != channeldb.ContractAccepted {
i.dispatchToClients(event) i.dispatchToClients(event)
} }
@ -228,7 +228,6 @@ func (i *InvoiceRegistry) dispatchToSingleClients(event *invoiceEvent) {
select { select {
case client.ntfnQueue.ChanIn() <- &invoiceEvent{ case client.ntfnQueue.ChanIn() <- &invoiceEvent{
state: event.state,
invoice: event.invoice, invoice: event.invoice,
}: }:
case <-i.quit: case <-i.quit:
@ -250,23 +249,24 @@ func (i *InvoiceRegistry) dispatchToClients(event *invoiceEvent) {
// ensure we don't duplicate any events. // ensure we don't duplicate any events.
// TODO(joostjager): Refactor switches. // TODO(joostjager): Refactor switches.
state := event.invoice.Terms.State
switch { switch {
// If we've already sent this settle event to // If we've already sent this settle event to
// the client, then we can skip this. // the client, then we can skip this.
case event.state == channeldb.ContractSettled && case state == channeldb.ContractSettled &&
client.settleIndex >= invoice.SettleIndex: client.settleIndex >= invoice.SettleIndex:
continue continue
// Similarly, if we've already sent this add to // Similarly, if we've already sent this add to
// the client then we can skip this one. // the client then we can skip this one.
case event.state == channeldb.ContractOpen && case state == channeldb.ContractOpen &&
client.addIndex >= invoice.AddIndex: client.addIndex >= invoice.AddIndex:
continue continue
// These two states should never happen, but we // These two states should never happen, but we
// log them just in case so we can detect this // log them just in case so we can detect this
// instance. // instance.
case event.state == channeldb.ContractOpen && case state == channeldb.ContractOpen &&
client.addIndex+1 != invoice.AddIndex: client.addIndex+1 != invoice.AddIndex:
log.Warnf("client=%v for invoice "+ log.Warnf("client=%v for invoice "+
"notifications missed an update, "+ "notifications missed an update, "+
@ -274,7 +274,7 @@ func (i *InvoiceRegistry) dispatchToClients(event *invoiceEvent) {
clientID, client.addIndex, clientID, client.addIndex,
invoice.AddIndex) invoice.AddIndex)
case event.state == channeldb.ContractSettled && case state == channeldb.ContractSettled &&
client.settleIndex+1 != invoice.SettleIndex: client.settleIndex+1 != invoice.SettleIndex:
log.Warnf("client=%v for invoice "+ log.Warnf("client=%v for invoice "+
"notifications missed an update, "+ "notifications missed an update, "+
@ -285,7 +285,6 @@ func (i *InvoiceRegistry) dispatchToClients(event *invoiceEvent) {
select { select {
case client.ntfnQueue.ChanIn() <- &invoiceEvent{ case client.ntfnQueue.ChanIn() <- &invoiceEvent{
state: event.state,
invoice: invoice, invoice: invoice,
}: }:
case <-i.quit: case <-i.quit:
@ -296,13 +295,14 @@ func (i *InvoiceRegistry) dispatchToClients(event *invoiceEvent) {
// the latest add/settle index it has. We'll use this to ensure // the latest add/settle index it has. We'll use this to ensure
// we don't send a notification twice, which can happen if a new // we don't send a notification twice, which can happen if a new
// event is added while we're catching up a new client. // event is added while we're catching up a new client.
switch event.state { switch event.invoice.Terms.State {
case channeldb.ContractSettled: case channeldb.ContractSettled:
client.settleIndex = invoice.SettleIndex client.settleIndex = invoice.SettleIndex
case channeldb.ContractOpen: case channeldb.ContractOpen:
client.addIndex = invoice.AddIndex client.addIndex = invoice.AddIndex
default: default:
log.Errorf("unexpected invoice state: %v", event.state) log.Errorf("unexpected invoice state: %v",
event.invoice.Terms.State)
} }
} }
} }
@ -333,7 +333,6 @@ func (i *InvoiceRegistry) deliverBacklogEvents(client *InvoiceSubscription) erro
select { select {
case client.ntfnQueue.ChanIn() <- &invoiceEvent{ case client.ntfnQueue.ChanIn() <- &invoiceEvent{
state: channeldb.ContractOpen,
invoice: &addEvent, invoice: &addEvent,
}: }:
case <-i.quit: case <-i.quit:
@ -348,7 +347,6 @@ func (i *InvoiceRegistry) deliverBacklogEvents(client *InvoiceSubscription) erro
select { select {
case client.ntfnQueue.ChanIn() <- &invoiceEvent{ case client.ntfnQueue.ChanIn() <- &invoiceEvent{
state: channeldb.ContractSettled,
invoice: &settleEvent, invoice: &settleEvent,
}: }:
case <-i.quit: case <-i.quit:
@ -381,7 +379,6 @@ func (i *InvoiceRegistry) deliverSingleBacklogEvents(
err = client.notify(&invoiceEvent{ err = client.notify(&invoiceEvent{
hash: client.hash, hash: client.hash,
invoice: &invoice, invoice: &invoice,
state: invoice.Terms.State,
}) })
if err != nil { if err != nil {
return err return err
@ -722,7 +719,6 @@ func (i *InvoiceRegistry) notifyClients(hash lntypes.Hash,
state channeldb.ContractState) { state channeldb.ContractState) {
event := &invoiceEvent{ event := &invoiceEvent{
state: state,
invoice: invoice, invoice: invoice,
hash: hash, hash: hash,
} }
@ -859,14 +855,15 @@ func (i *InvoiceRegistry) SubscribeNotifications(addIndex, settleIndex uint64) *
invoiceEvent := ntfn.(*invoiceEvent) invoiceEvent := ntfn.(*invoiceEvent)
var targetChan chan *channeldb.Invoice var targetChan chan *channeldb.Invoice
switch invoiceEvent.state { state := invoiceEvent.invoice.Terms.State
switch state {
case channeldb.ContractOpen: case channeldb.ContractOpen:
targetChan = client.NewInvoices targetChan = client.NewInvoices
case channeldb.ContractSettled: case channeldb.ContractSettled:
targetChan = client.SettledInvoices targetChan = client.SettledInvoices
default: default:
log.Errorf("unknown invoice "+ log.Errorf("unknown invoice "+
"state: %v", invoiceEvent.state) "state: %v", state)
continue continue
} }