record: move CustomRecordSet

invoices/interface.go

@@ -1,7 +1,6 @@
 package invoices
 
 import (
-	"github.com/lightningnetwork/lnd/htlcswitch/hop"
 	"github.com/lightningnetwork/lnd/record"
 )
 
@@ -14,5 +13,5 @@ type Payload interface {
 
 	// CustomRecords returns the custom tlv type records that were parsed
 	// from the payload.
-	CustomRecords() hop.CustomRecordSet
+	CustomRecords() record.CustomSet
 }

invoices/invoiceregistry_test.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/lightningnetwork/lnd/channeldb"
-	"github.com/lightningnetwork/lnd/htlcswitch/hop"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/record"
@@ -690,8 +689,8 @@ func (p *mockPayload) MultiPath() *record.MPP {
 	return p.mpp
 }
 
-func (p *mockPayload) CustomRecords() hop.CustomRecordSet {
-	return make(hop.CustomRecordSet)
+func (p *mockPayload) CustomRecords() record.CustomSet {
+	return make(record.CustomSet)
 }
 
 // TestSettleMpp tests settling of an invoice with multiple partial payments.

invoices/update.go

@@ -3,8 +3,6 @@ package invoices
 import (
 	"errors"
 
-	"github.com/lightningnetwork/lnd/htlcswitch/hop"
-
 	"github.com/lightningnetwork/lnd/channeldb"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/record"
@@ -105,7 +103,7 @@ type invoiceUpdateCtx struct {
 	expiry               uint32
 	currentHeight        int32
 	finalCltvRejectDelta int32
-	customRecords        hop.CustomRecordSet
+	customRecords        record.CustomSet
 	mpp                  *record.MPP
 }