mempool queue update generic constraints

Author: najeal

internal/list/list.go

@@ -67,6 +67,10 @@ func (e *Element[T]) GetExpiry() int64 {
 	return e.value.GetExpiry()
 }
 
+func (e *Element[T]) Priority() uint64 {
+	return e.value.Priority()
+}
+
 func (l *List[T]) First() *Element[T] {
 	if l.size == 0 {
 		return nil

internal/mempool/mempool.go

@@ -31,7 +31,7 @@ type Item interface {
 	Priority() uint64
 }
 
-type Mempool[T Item, E eheap.Item] struct {
+type Mempool[T Item, E queue.Item] struct {
 	tracer trace.Tracer
 
 	mu sync.RWMutex

internal/mempool/queue/fifo_queue.go

@@ -7,7 +7,7 @@ import (
 	"github.com/ava-labs/hypersdk/internal/list"
 )
 
-var _ Queue[list.Item, *list.Element[list.Item]] = (*FIFOQueue[list.Item])(nil)
+var _ Queue[Item, *list.Element[Item]] = (*FIFOQueue[Item])(nil)
 
 type FIFOQueue[T list.Item] struct {
 	*list.List[T]

internal/mempool/queue/priority_queue.go

@@ -4,13 +4,12 @@
 package queue
 
 import (
-	"github.com/ava-labs/hypersdk/internal/list"
 	"github.com/ava-labs/hypersdk/internal/pheap"
 )
 
-var _ Queue[list.Item, list.Item] = (*PriorityQueue[list.Item])(nil)
+var _ Queue[Item, Item] = (*PriorityQueue[Item])(nil)
 
-type PriorityQueue[T list.Item] struct {
+type PriorityQueue[T Item] struct {
 	*pheap.PriorityHeap[T]
 }
 

internal/mempool/queue/queue.go

@@ -13,11 +13,11 @@ type Item interface {
 	Priority() uint64
 }
 
-type Queue[T Item, Elem any] interface {
+type Queue[T Item, E Item] interface {
 	Size() int
-	First() (Elem, bool)
+	First() (E, bool)
 	FirstValue() (T, bool)
-	Remove(Elem) T
-	Push(T) Elem
-	Restore(T) Elem
+	Remove(E) T
+	Push(T) E
+	Restore(T) E
 }