invoices+channeldb: move invoice state check to invoiceregistry

channeldb/invoice_test.go

@@ -662,5 +662,9 @@ func TestQueryInvoices(t *testing.T) {
 }
 
 func checkHtlcParameters(invoice *Invoice) error {
+	if invoice.Terms.State == ContractSettled {
+		return ErrInvoiceAlreadySettled
+	}
+
 	return nil
 }

channeldb/invoices.go

@@ -1003,17 +1003,6 @@ func acceptOrSettleInvoice(invoices, settleIndex *bbolt.Bucket,
 		return nil, err
 	}
 
-	state := invoice.Terms.State
-
-	switch {
-	case state == ContractAccepted:
-		return &invoice, ErrInvoiceAlreadyAccepted
-	case state == ContractSettled:
-		return &invoice, ErrInvoiceAlreadySettled
-	case state == ContractCanceled:
-		return &invoice, ErrInvoiceAlreadyCanceled
-	}
-
 	// If the invoice is still open, check the htlc parameters.
 	if err := checkHtlcParameters(&invoice); err != nil {
 		return &invoice, err