Merge pull request #1952 from CortexFoundation/dev

remove dependency on golang.org/exp
CortexFoundation · Mar 26, 2024 · 186762d · 186762d
2 parents 59be190 + 408efeb
commit 186762d
Show file tree

Hide file tree

Showing 52 changed files with 41 additions and 4,679 deletions.
diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go
@@ -28,7 +28,7 @@ import (
 	"time"
 
 	mapset "github.com/deckarep/golang-set/v2"
-	"golang.org/x/exp/slices"
+	"slices"
 
 	"github.com/CortexFoundation/CortexTheseus/accounts"
 	"github.com/CortexFoundation/CortexTheseus/common"

diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go
@@ -30,7 +30,7 @@ import (
 	"github.com/CortexFoundation/CortexTheseus/common"
 	"github.com/cespare/cp"
 	"github.com/davecgh/go-spew/spew"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 var (

diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/CortexFoundation/CortexTheseus/accounts"
 	"github.com/CortexFoundation/CortexTheseus/common"
 	"github.com/CortexFoundation/CortexTheseus/event"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 var testSigData = make([]byte, 32)

diff --git a/build/update-license.go b/build/update-license.go
@@ -52,7 +52,7 @@ import (
 	"text/template"
 	"time"
 
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 var (

diff --git a/cmd/devp2p/dns_route53.go b/cmd/devp2p/dns_route53.go
@@ -29,8 +29,8 @@ import (
 	"github.com/aws/aws-sdk-go-v2/credentials"
 	"github.com/aws/aws-sdk-go-v2/service/route53"
 	"github.com/aws/aws-sdk-go-v2/service/route53/types"
-	"golang.org/x/exp/slices"
 	"gopkg.in/urfave/cli.v1"
+	"slices"
 
 	"github.com/CortexFoundation/CortexTheseus/log"
 	"github.com/CortexFoundation/CortexTheseus/p2p/dnsdisc"

diff --git a/cmd/devp2p/nodeset.go b/cmd/devp2p/nodeset.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"time"
 
-	"golang.org/x/exp/slices"
+	"slices"
 
 	"github.com/CortexFoundation/CortexTheseus/common"
 	"github.com/CortexFoundation/CortexTheseus/p2p/enode"

diff --git a/common/prque/lazyqueue.go b/common/prque/lazyqueue.go
@@ -20,7 +20,7 @@ import (
 	"container/heap"
 	"time"
 
-	"golang.org/x/exp/constraints"
+	"cmp"
 
 	"github.com/CortexFoundation/CortexTheseus/common/mclock"
 )
@@ -34,7 +34,7 @@ import (
 //
 // If the upper estimate is exceeded then Update should be called for that item.
 // A global Refresh function should also be called periodically.
-type LazyQueue[P constraints.Ordered, V any] struct {
+type LazyQueue[P cmp.Ordered, V any] struct {
 	clock mclock.Clock
 	// Items are stored in one of two internal queues ordered by estimated max
 	// priority until the next and the next-after-next refresh. Update and Refresh
@@ -51,12 +51,12 @@ type LazyQueue[P constraints.Ordered, V any] struct {
 }
 
 type (
-	PriorityCallback[P constraints.Ordered, V any]    func(data V) P                       // actual priority callback
-	MaxPriorityCallback[P constraints.Ordered, V any] func(data V, until mclock.AbsTime) P // estimated maximum priority callback
+	PriorityCallback[P cmp.Ordered, V any]    func(data V) P                       // actual priority callback
+	MaxPriorityCallback[P cmp.Ordered, V any] func(data V, until mclock.AbsTime) P // estimated maximum priority callback
 )
 
 // NewLazyQueue creates a new lazy queue
-func NewLazyQueue[P constraints.Ordered, V any](setIndex SetIndexCallback[V], priority PriorityCallback[P, V], maxPriority MaxPriorityCallback[P, V], clock mclock.Clock, refreshPeriod time.Duration) *LazyQueue[P, V] {
+func NewLazyQueue[P cmp.Ordered, V any](setIndex SetIndexCallback[V], priority PriorityCallback[P, V], maxPriority MaxPriorityCallback[P, V], clock mclock.Clock, refreshPeriod time.Duration) *LazyQueue[P, V] {
 	q := &LazyQueue[P, V]{
 		popQueue:     newSstack[P, V](nil),
 		setIndex:     setIndex,

diff --git a/common/prque/prque.go b/common/prque/prque.go
@@ -20,16 +20,16 @@ package prque
 import (
 	"container/heap"
 
-	"golang.org/x/exp/constraints"
+	"cmp"
 )
 
 // Priority queue data structure.
-type Prque[P constraints.Ordered, V any] struct {
+type Prque[P cmp.Ordered, V any] struct {
 	cont *sstack[P, V]
 }
 
 // New creates a new priority queue.
-func New[P constraints.Ordered, V any](setIndex SetIndexCallback[V]) *Prque[P, V] {
+func New[P cmp.Ordered, V any](setIndex SetIndexCallback[V]) *Prque[P, V] {
 	return &Prque[P, V]{newSstack[P, V](setIndex)}
 }
 

diff --git a/common/prque/sstack.go b/common/prque/sstack.go
@@ -10,13 +10,13 @@
 
 package prque
 
-import "golang.org/x/exp/constraints"
+import "cmp"
 
 // The size of a block of data
 const blockSize = 4096
 
 // A prioritized item in the sorted stack.
-type item[P constraints.Ordered, V any] struct {
+type item[P cmp.Ordered, V any] struct {
 	value    V
 	priority P
 }
@@ -29,7 +29,7 @@ type SetIndexCallback[V any] func(data V, index int)
 // Internal sortable stack data structure. Implements the Push and Pop ops for
 // the stack (heap) functionality and the Len, Less and Swap methods for the
 // sortability requirements of the heaps.
-type sstack[P constraints.Ordered, V any] struct {
+type sstack[P cmp.Ordered, V any] struct {
 	setIndex SetIndexCallback[V]
 	size     int
 	capacity int
@@ -40,7 +40,7 @@ type sstack[P constraints.Ordered, V any] struct {
 }
 
 // Creates a new, empty stack.
-func newSstack[P constraints.Ordered, V any](setIndex SetIndexCallback[V]) *sstack[P, V] {
+func newSstack[P cmp.Ordered, V any](setIndex SetIndexCallback[V]) *sstack[P, V] {
 	result := new(sstack[P, V])
 	result.setIndex = setIndex
 	result.active = make([]*item[P, V], blockSize)

diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	lru "github.com/hashicorp/golang-lru"
-	"golang.org/x/exp/slices"
+	"slices"
 
 	"github.com/CortexFoundation/CortexTheseus/common"
 	"github.com/CortexFoundation/CortexTheseus/core/rawdb"

diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/CortexFoundation/CortexTheseus/core/vm"
 	"github.com/CortexFoundation/CortexTheseus/crypto"
 	"github.com/CortexFoundation/CortexTheseus/params"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 // testerAccountPool is a pool to maintain currently active tester accounts,

diff --git a/core/blockchain.go b/core/blockchain.go
@@ -27,7 +27,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"golang.org/x/exp/slices"
+	"slices"
 
 	"github.com/CortexFoundation/CortexTheseus/common"
 	"github.com/CortexFoundation/CortexTheseus/common/lru"

diff --git a/core/forkid/forkid.go b/core/forkid/forkid.go
@@ -26,7 +26,7 @@ import (
 	"reflect"
 	"strings"
 
-	"golang.org/x/exp/slices"
+	"slices"
 
 	"github.com/CortexFoundation/CortexTheseus/core/types"
 	"github.com/CortexFoundation/CortexTheseus/log"

diff --git a/core/mkalloc.go b/core/mkalloc.go
@@ -32,7 +32,7 @@ import (
 	"os"
 	"strconv"
 
-	"golang.org/x/exp/slices"
+	"slices"
 
 	"github.com/CortexFoundation/CortexTheseus/core"
 	"github.com/CortexFoundation/CortexTheseus/rlp"

diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"golang.org/x/exp/slices"
+	"slices"
 
 	"github.com/CortexFoundation/CortexTheseus/common"
 	"github.com/CortexFoundation/CortexTheseus/core/types"

diff --git a/core/state/snapshot/difflayer.go b/core/state/snapshot/difflayer.go
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	bloomfilter "github.com/holiman/bloomfilter/v2"
-	"golang.org/x/exp/slices"
+	"slices"
 
 	"github.com/CortexFoundation/CortexTheseus/common"
 	"github.com/CortexFoundation/CortexTheseus/core/types"

diff --git a/core/state/snapshot/iterator_fast.go b/core/state/snapshot/iterator_fast.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"sort"
 
-	"golang.org/x/exp/slices"
+	"slices"
 
 	"github.com/CortexFoundation/CortexTheseus/common"
 )

diff --git a/core/txpool/list.go b/core/txpool/list.go
@@ -25,7 +25,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"golang.org/x/exp/slices"
+	"slices"
 
 	"github.com/CortexFoundation/CortexTheseus/common"
 	"github.com/CortexFoundation/CortexTheseus/core/types"

diff --git a/ctxcdb/dbtest/testsuite.go b/ctxcdb/dbtest/testsuite.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	"github.com/CortexFoundation/CortexTheseus/ctxcdb"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 // TestDatabaseSuite runs a suite of tests against a KeyValueStore database

diff --git a/go.mod b/go.mod
@@ -64,7 +64,6 @@ require (
 	github.com/urfave/cli/v2 v2.27.1
 	go.uber.org/automaxprocs v1.5.3
 	golang.org/x/crypto v0.21.0
-	golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81
 	golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f
 	golang.org/x/sync v0.6.0
 	golang.org/x/sys v0.18.0
@@ -239,6 +238,7 @@ require (
 	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
+	golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 // indirect
 	golang.org/x/mod v0.16.0 // indirect
 	golang.org/x/net v0.22.0 // indirect
 	golang.org/x/term v0.18.0 // indirect

diff --git a/metrics/sample.go b/metrics/sample.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 const rescaleThreshold = time.Hour

diff --git a/metrics/writer.go b/metrics/writer.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 // Write sorts writes each metric in the given registry periodically to the

diff --git a/metrics/writer_test.go b/metrics/writer_test.go
@@ -3,7 +3,7 @@ package metrics
 import (
 	"testing"
 
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 func TestMetricsSorting(t *testing.T) {

diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go
@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/CortexFoundation/CortexTheseus/log"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 const (

diff --git a/p2p/discover/table_util_test.go b/p2p/discover/table_util_test.go
@@ -29,7 +29,7 @@ import (
 	"github.com/CortexFoundation/CortexTheseus/crypto"
 	"github.com/CortexFoundation/CortexTheseus/p2p/enode"
 	"github.com/CortexFoundation/CortexTheseus/p2p/enr"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 var nullNode *enode.Node

diff --git a/p2p/discover/v4_lookup_test.go b/p2p/discover/v4_lookup_test.go
@@ -26,7 +26,7 @@ import (
 	"github.com/CortexFoundation/CortexTheseus/p2p/discover/v4wire"
 	"github.com/CortexFoundation/CortexTheseus/p2p/enode"
 	"github.com/CortexFoundation/CortexTheseus/p2p/enr"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 func TestUDPv4_Lookup(t *testing.T) {

diff --git a/p2p/discover/v5_udp_test.go b/p2p/discover/v5_udp_test.go
@@ -34,7 +34,7 @@ import (
 	"github.com/CortexFoundation/CortexTheseus/p2p/enr"
 	"github.com/CortexFoundation/CortexTheseus/rlp"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 // Real sockets, real crypto: this test checks end-to-end connectivity for UDPv5.

diff --git a/p2p/dnsdisc/tree.go b/p2p/dnsdisc/tree.go
@@ -30,7 +30,7 @@ import (
 	"github.com/CortexFoundation/CortexTheseus/p2p/enr"
 	"github.com/CortexFoundation/CortexTheseus/rlp"
 	"golang.org/x/crypto/sha3"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 // Tree is a merkle tree of node records.

diff --git a/p2p/peer.go b/p2p/peer.go
@@ -31,7 +31,7 @@ import (
 	"github.com/CortexFoundation/CortexTheseus/p2p/enode"
 	"github.com/CortexFoundation/CortexTheseus/p2p/enr"
 	"github.com/CortexFoundation/CortexTheseus/rlp"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 var (

diff --git a/p2p/server.go b/p2p/server.go
@@ -38,7 +38,7 @@ import (
 	"github.com/CortexFoundation/CortexTheseus/p2p/enr"
 	"github.com/CortexFoundation/CortexTheseus/p2p/nat"
 	"github.com/CortexFoundation/CortexTheseus/p2p/netutil"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 const (

diff --git a/tests/fuzzers/stacktrie/trie_fuzzer.go b/tests/fuzzers/stacktrie/trie_fuzzer.go
@@ -28,7 +28,7 @@ import (
 	"github.com/CortexFoundation/CortexTheseus/ctxcdb"
 	"github.com/CortexFoundation/CortexTheseus/trie"
 	"golang.org/x/crypto/sha3"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 type fuzzer struct {

diff --git a/trie/proof_test.go b/trie/proof_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/CortexFoundation/CortexTheseus/core/rawdb"
 	"github.com/CortexFoundation/CortexTheseus/crypto"
 	"github.com/CortexFoundation/CortexTheseus/ctxcdb/memorydb"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 func init() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,7 @@ import ( @@
     	"text/template"
     	"time"
-    	"golang.org/x/exp/slices"
+    	"slices"
     )
     var (
@@ Expand Down @@