diff --git a/fn/conc_queue.go b/fn/conc_queue.go index 0d0dde207..0c52c4491 100644 --- a/fn/conc_queue.go +++ b/fn/conc_queue.go @@ -2,8 +2,6 @@ package fn import ( "sync" - - "github.com/lightninglabs/neutrino/cache/lru" ) // ConcurrentQueue is a typed concurrent-safe FIFO queue with unbounded @@ -17,7 +15,7 @@ type ConcurrentQueue[T any] struct { chanIn chan T chanOut chan T - overflow *lru.List[T] + overflow *List[T] wg sync.WaitGroup quit chan struct{} @@ -25,13 +23,13 @@ type ConcurrentQueue[T any] struct { // NewConcurrentQueue constructs a ConcurrentQueue. The bufferSize parameter is // the capacity of the output channel. When the size of the queue is below this -// threshold, pushes do n[?12;4$yot incur the overhead of the less efficient overflow +// threshold, pushes do not incur the overhead of the less efficient overflow // structure. func NewConcurrentQueue[T any](bufferSize int) *ConcurrentQueue[T] { return &ConcurrentQueue[T]{ chanIn: make(chan T), chanOut: make(chan T, bufferSize), - overflow: lru.NewList[T](), + overflow: NewList[T](), quit: make(chan struct{}), } } diff --git a/fn/go.mod b/fn/go.mod index e14cb555a..1780b9968 100644 --- a/fn/go.mod +++ b/fn/go.mod @@ -3,9 +3,9 @@ module github.com/lightningnetwork/lnd/fn go 1.19 require ( - github.com/lightninglabs/neutrino/cache v1.1.2 github.com/stretchr/testify v1.8.1 golang.org/x/exp v0.0.0-20231226003508-02704c960a9b + golang.org/x/sync v0.7.0 ) require ( diff --git a/fn/go.sum b/fn/go.sum index 73345fe5e..86f138bc5 100644 --- a/fn/go.sum +++ b/fn/go.sum @@ -1,8 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/lightninglabs/neutrino/cache v1.1.2 h1:C9DY/DAPaPxbFC+xNNEI/z1SJY9GS3shmlu5hIQ798g= -github.com/lightninglabs/neutrino/cache v1.1.2/go.mod h1:XJNcgdOw1LQnanGjw8Vj44CvguYA25IMKjWFZczwZuo= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -14,6 +12,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= golang.org/x/exp v0.0.0-20231226003508-02704c960a9b h1:kLiC65FbiHWFAOu+lxwNPujcsl8VYyTYYEZnsOO1WK4= golang.org/x/exp v0.0.0-20231226003508-02704c960a9b/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=