refactor: replace experimental maps and slices with stdlib

The experimental functions are now available in the standard library in Go 1.21 [1] and Go 1.23 [2]. [1]: https://go.dev/doc/go1.21#slices [2]: https://go.dev/doc/go1.23#new-unique-package Signed-off-by: Eng Zer Jun <[email protected]>
algorand · Nov 25, 2024 · 09609b2 · 09609b2
1 parent 0bc3d7e
commit 09609b2
Show file tree

Hide file tree

Showing 37 changed files with 68 additions and 73 deletions.
diff --git a/agreement/agreementtest/simulate_test.go b/agreement/agreementtest/simulate_test.go
@@ -19,6 +19,7 @@ package agreementtest
 import (
 	"context"
 	"fmt"
+	"maps"
 	"math/rand"
 	"os"
 	"strconv"
@@ -27,7 +28,6 @@ import (
 
 	"github.com/algorand/go-deadlock"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/maps"
 
 	"github.com/algorand/go-algorand/agreement"
 	"github.com/algorand/go-algorand/config"

diff --git a/agreement/autopsy.go b/agreement/autopsy.go
@@ -20,11 +20,11 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"slices"
 
 	"github.com/algorand/go-algorand/data/basics"
 	"github.com/algorand/go-algorand/logging"
 	"github.com/algorand/go-algorand/protocol"
-	"golang.org/x/exp/slices"
 )
 
 // An Autopsy is a trace of the ordered input events and output

diff --git a/agreement/common_test.go b/agreement/common_test.go
@@ -19,12 +19,12 @@ package agreement
 import (
 	"context"
 	"fmt"
+	"maps"
 	"math/rand"
 	"testing"
 
 	"github.com/algorand/go-deadlock"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/maps"
 
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/crypto"

diff --git a/cmd/algokey/keyreg.go b/cmd/algokey/keyreg.go
@@ -20,11 +20,12 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
+	"maps"
 	"os"
+	"slices"
 	"strings"
 
 	"github.com/spf13/cobra"
-	"golang.org/x/exp/maps"
 
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/data/account"
@@ -95,7 +96,7 @@ func init() {
 		"betanet": mustConvertB64ToDigest("mFgazF+2uRS1tMiL9dsj01hJGySEmPN28B/TjjvpVW0="),
 		"devnet":  mustConvertB64ToDigest("sC3P7e2SdbqKJK0tbiCdK9tdSpbe6XeCGKdoNzmlj0E="),
 	}
-	validNetworkList = maps.Keys(validNetworks)
+	validNetworkList = slices.Collect(maps.Keys(validNetworks))
 }
 
 func mustConvertB64ToDigest(b64 string) (digest crypto.Digest) {

diff --git a/cmd/goal/account.go b/cmd/goal/account.go
@@ -24,12 +24,12 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"slices"
 	"sort"
 	"strings"
 	"time"
 
 	"github.com/spf13/cobra"
-	"golang.org/x/exp/slices"
 
 	"github.com/algorand/go-algorand/cmd/util/datadir"
 	"github.com/algorand/go-algorand/config"

diff --git a/cmd/tealdbg/local.go b/cmd/tealdbg/local.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"slices"
 	"time"
 
 	"github.com/algorand/go-algorand/config"
@@ -28,7 +29,6 @@ import (
 	"github.com/algorand/go-algorand/data/transactions/logic"
 	"github.com/algorand/go-algorand/ledger/apply"
 	"github.com/algorand/go-algorand/protocol"
-	"golang.org/x/exp/slices"
 )
 
 func protoFromString(protoString string) (name string, proto config.ConsensusParams, err error) {

diff --git a/crypto/merklearray/merkle.go b/crypto/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 (

diff --git a/crypto/merkletrie/cache.go b/crypto/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)
 

diff --git a/crypto/merkletrie/committer.go b/crypto/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 {

diff --git a/crypto/merkletrie/committer_test.go b/crypto/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"

diff --git a/crypto/merkletrie/node.go b/crypto/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 {

diff --git a/daemon/algod/api/server/v2/account.go b/daemon/algod/api/server/v2/account.go
@@ -20,14 +20,14 @@ import (
 	"encoding/base64"
 	"errors"
 	"math"
+	"slices"
 	"sort"
 
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/crypto/merklesignature"
 	"github.com/algorand/go-algorand/daemon/algod/api/server/v2/generated/model"
 	"github.com/algorand/go-algorand/data/basics"
-	"golang.org/x/exp/slices"
 )
 
 // AssetHolding converts between basics.AssetHolding and model.AssetHolding

diff --git a/daemon/algod/api/server/v2/test/handlers_test.go b/daemon/algod/api/server/v2/test/handlers_test.go
@@ -28,6 +28,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"reflect"
+	"slices"
 	"strings"
 	"testing"
 	"time"
@@ -37,7 +38,6 @@ import (
 	"github.com/algorand/go-algorand/daemon/algod/api/server"
 	"github.com/algorand/go-algorand/ledger/eval"
 	"github.com/algorand/go-algorand/ledger/ledgercore"
-	"golang.org/x/exp/slices"
 
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"

diff --git a/daemon/algod/api/server/v2/utils.go b/daemon/algod/api/server/v2/utils.go
@@ -20,15 +20,15 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
+	"maps"
 	"net/http"
+	"slices"
 	"strings"
 	"unicode"
 	"unicode/utf8"
 
 	"github.com/algorand/go-codec/codec"
 	"github.com/labstack/echo/v4"
-	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/daemon/algod/api/server/v2/generated/model"
@@ -494,23 +494,23 @@ func convertUnnamedResourcesAccessed(resources *simulation.ResourceTracker) *mod
 		return nil
 	}
 	return &model.SimulateUnnamedResourcesAccessed{
-		Accounts: sliceOrNil(stringSlice(maps.Keys(resources.Accounts))),
-		Assets:   sliceOrNil(uint64Slice(maps.Keys(resources.Assets))),
-		Apps:     sliceOrNil(uint64Slice(maps.Keys(resources.Apps))),
-		Boxes: sliceOrNil(convertSlice(maps.Keys(resources.Boxes), func(box logic.BoxRef) model.BoxReference {
+		Accounts: sliceOrNil(stringSlice(slices.Collect(maps.Keys(resources.Accounts)))),
+		Assets:   sliceOrNil(uint64Slice(slices.Collect(maps.Keys(resources.Assets)))),
+		Apps:     sliceOrNil(uint64Slice(slices.Collect(maps.Keys(resources.Apps)))),
+		Boxes: sliceOrNil(convertSlice(slices.Collect(maps.Keys(resources.Boxes)), func(box logic.BoxRef) model.BoxReference {
 			return model.BoxReference{
 				App:  uint64(box.App),
 				Name: []byte(box.Name),
 			}
 		})),
 		ExtraBoxRefs: omitEmpty(uint64(resources.NumEmptyBoxRefs)),
-		AssetHoldings: sliceOrNil(convertSlice(maps.Keys(resources.AssetHoldings), func(holding ledgercore.AccountAsset) model.AssetHoldingReference {
+		AssetHoldings: sliceOrNil(convertSlice(slices.Collect(maps.Keys(resources.AssetHoldings)), func(holding ledgercore.AccountAsset) model.AssetHoldingReference {
 			return model.AssetHoldingReference{
 				Account: holding.Address.String(),
 				Asset:   uint64(holding.Asset),
 			}
 		})),
-		AppLocals: sliceOrNil(convertSlice(maps.Keys(resources.AppLocals), func(local ledgercore.AccountApp) model.ApplicationLocalReference {
+		AppLocals: sliceOrNil(convertSlice(slices.Collect(maps.Keys(resources.AppLocals)), func(local ledgercore.AccountApp) model.ApplicationLocalReference {
 			return model.ApplicationLocalReference{
 				Account: local.Address.String(),
 				App:     uint64(local.App),

diff --git a/data/basics/teal.go b/data/basics/teal.go
@@ -19,9 +19,9 @@ package basics
 import (
 	"encoding/hex"
 	"fmt"
+	"maps"
 
 	"github.com/algorand/go-algorand/config"
-	"golang.org/x/exp/maps"
 )
 
 // DeltaAction is an enum of actions that may be performed when applying a

diff --git a/data/basics/userBalance.go b/data/basics/userBalance.go
@@ -20,13 +20,13 @@ import (
 	"encoding/binary"
 	"fmt"
 	"reflect"
+	"slices"
 
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/crypto/merklesignature"
 	"github.com/algorand/go-algorand/logging"
 	"github.com/algorand/go-algorand/protocol"
-	"golang.org/x/exp/slices"
 )
 
 // Status is the delegation status of an account's MicroAlgos

diff --git a/data/transactions/application.go b/data/transactions/application.go
@@ -18,9 +18,9 @@ package transactions
 
 import (
 	"fmt"
+	"slices"
 
 	"github.com/algorand/go-algorand/data/basics"
-	"golang.org/x/exp/slices"
 )
 
 const (

diff --git a/data/transactions/logic/crypto_test.go b/data/transactions/logic/crypto_test.go
@@ -25,11 +25,11 @@ import (
 	"encoding/hex"
 	"fmt"
 	"math/big"
+	"slices"
 	"strconv"
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
 
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/crypto/secp256k1"

diff --git a/data/transactions/logic/eval.go b/data/transactions/logic/eval.go
@@ -28,11 +28,10 @@ import (
 	"math/big"
 	"math/bits"
 	"runtime"
+	"slices"
 	"strconv"
 	"strings"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/data/basics"

diff --git a/data/transactions/logic/opcodes.go b/data/transactions/logic/opcodes.go
@@ -19,12 +19,12 @@ package logic
 import (
 	"cmp"
 	"fmt"
+	"maps"
+	"slices"
 	"strconv"
 	"strings"
 
 	"github.com/algorand/go-algorand/data/basics"
-	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 )
 
 // LogicVersion defines default assembler and max eval versions
@@ -839,10 +839,9 @@ func OpcodesByVersion(version uint64) []OpSpec {
 		}
 	}
 	result := maps.Values(subv)
-	slices.SortFunc(result, func(a, b OpSpec) int {
+	return slices.SortedFunc(result, func(a, b OpSpec) int {
 		return cmp.Compare(a.Opcode, b.Opcode)
 	})
-	return result
 }
 
 // direct opcode bytes

diff --git a/data/transactions/logic/opcodes_test.go b/data/transactions/logic/opcodes_test.go
@@ -19,11 +19,11 @@ package logic
 import (
 	"fmt"
 	"reflect"
+	"slices"
 	"testing"
 
 	"github.com/algorand/go-algorand/test/partitiontest"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
 )
 
 func TestOpSpecs(t *testing.T) {

diff --git a/data/transactions/teal.go b/data/transactions/teal.go
@@ -18,11 +18,11 @@ package transactions
 
 import (
 	"bytes"
+	"maps"
+	"slices"
 
 	"github.com/algorand/go-algorand/data/basics"
 	"github.com/algorand/go-algorand/protocol"
-	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 )
 
 // EvalDelta stores StateDeltas for an application's global key/value store, as

diff --git a/data/transactions/transaction.go b/data/transactions/transaction.go
@@ -21,13 +21,13 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+	"slices"
 	"sync"
 
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/data/basics"
 	"github.com/algorand/go-algorand/protocol"
-	"golang.org/x/exp/slices"
 )
 
 // Txid is a hash used to uniquely identify individual transactions

diff --git a/ledger/apply/application_test.go b/ledger/apply/application_test.go
@@ -18,11 +18,11 @@ package apply
 
 import (
 	"fmt"
+	"maps"
 	"math/rand"
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/maps"
 
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/crypto"