Merge pull request algorand#6208 from Algo-devops-service/relbeta4.0.0

merklearray/merkle.go

@@ -21,10 +21,10 @@ import (
 	"errors"
 	"fmt"
 	"hash"
+	"slices"
 	"sort"
 
 	"github.com/algorand/go-algorand/crypto"
-	"golang.org/x/exp/slices"
 )
 
 const (

merkletrie/cache.go

@@ -21,9 +21,8 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-
-	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
+	"maps"
+	"slices"
 )
 
 // storedNodeIdentifier is the "equivalent" of a node-ptr, but oriented around persisting the
@@ -448,8 +447,7 @@ func (mtc *merkleTrieCache) reallocatePendingPages(stats *CommitStats) (pagesToC
 	}
 
 	// create a sorted list of created pages
-	sortedCreatedPages := maps.Keys(createdPages)
-	slices.Sort(sortedCreatedPages)
+	sortedCreatedPages := slices.Sorted(maps.Keys(createdPages))
 
 	mtc.reallocatedPages = make(map[uint64]map[storedNodeIdentifier]*node)
 

merkletrie/committer.go

@@ -16,7 +16,7 @@
 
 package merkletrie
 
-import "golang.org/x/exp/slices"
+import "slices"
 
 // Committer is the interface supporting serializing tries into persistent storage.
 type Committer interface {

merkletrie/committer_test.go

@@ -18,10 +18,10 @@ package merkletrie
 
 import (
 	"encoding/binary"
+	"slices"
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
 
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/test/partitiontest"

merkletrie/node.go

@@ -19,11 +19,11 @@ package merkletrie
 import (
 	"bytes"
 	"encoding/binary"
+	"slices"
 	"sort"
 	"unsafe"
 
 	"github.com/algorand/go-algorand/crypto"
-	"golang.org/x/exp/slices"
 )
 
 type childEntry struct {