diff --git a/accounts/manager.go b/accounts/manager.go index 586cd5e9b4..c697eeb4c9 100644 --- a/accounts/manager.go +++ b/accounts/manager.go @@ -18,12 +18,12 @@ package accounts import ( "reflect" + "slices" "sort" "sync" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/event" - "slices" ) // managerSubBufferSize determines how many incoming wallet events diff --git a/accounts/scwallet/wallet.go b/accounts/scwallet/wallet.go index 862515f1e6..e0f5c14e81 100644 --- a/accounts/scwallet/wallet.go +++ b/accounts/scwallet/wallet.go @@ -28,6 +28,7 @@ import ( "fmt" "math/big" "regexp" + "slices" "sort" "strings" "sync" @@ -41,7 +42,6 @@ import ( "github.com/ethereum/go-ethereum/log" pcsc "github.com/gballet/go-libpcsclite" "github.com/status-im/keycard-go/derivationpath" - "slices" ) // ErrPairingPasswordNeeded is returned if opening the smart card requires pairing with a pairing diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index 58a3a9752f..a7c53f9ecc 100644 --- a/accounts/usbwallet/wallet.go +++ b/accounts/usbwallet/wallet.go @@ -22,6 +22,7 @@ import ( "fmt" "io" "math/big" + "slices" "sync" "time" @@ -32,7 +33,6 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/log" "github.com/karalabe/hid" - "slices" ) // Maximum time between wallet health checks to detect USB unplugs. diff --git a/beacon/light/canonical.go b/beacon/light/canonical.go index 7a85d79bc7..74ce7d36dd 100644 --- a/beacon/light/canonical.go +++ b/beacon/light/canonical.go @@ -19,12 +19,12 @@ package light import ( "encoding/binary" "fmt" + "slices" "github.com/ethereum/go-ethereum/common/lru" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rlp" - "slices" ) // canonicalStore stores instances of the given type in a database and caches diff --git a/cmd/devp2p/internal/ethtest/suite.go b/cmd/devp2p/internal/ethtest/suite.go index 0e9d1b5d8d..9a25313dfb 100644 --- a/cmd/devp2p/internal/ethtest/suite.go +++ b/cmd/devp2p/internal/ethtest/suite.go @@ -21,6 +21,7 @@ import ( "crypto/rand" "fmt" "reflect" + "slices" "sync" "time" @@ -34,7 +35,6 @@ import ( "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/holiman/uint256" - "slices" ) // Suite represents a structure used to test a node's conformance diff --git a/core/rawdb/chain_freezer.go b/core/rawdb/chain_freezer.go index af797665d6..4efefab7e7 100644 --- a/core/rawdb/chain_freezer.go +++ b/core/rawdb/chain_freezer.go @@ -19,6 +19,7 @@ package rawdb import ( "errors" "fmt" + "slices" "sync" "time" @@ -26,7 +27,6 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" - "slices" ) const ( diff --git a/core/txpool/blobpool/blobpool.go b/core/txpool/blobpool/blobpool.go index a3bdacc7fc..4281a1b364 100644 --- a/core/txpool/blobpool/blobpool.go +++ b/core/txpool/blobpool/blobpool.go @@ -25,6 +25,7 @@ import ( "math/big" "os" "path/filepath" + "slices" "sort" "sync" "time" @@ -44,7 +45,6 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/holiman/billy" "github.com/holiman/uint256" - "slices" ) const ( diff --git a/core/types/tx_blob.go b/core/types/tx_blob.go index fdcdf633ef..f08bcbce7a 100644 --- a/core/types/tx_blob.go +++ b/core/types/tx_blob.go @@ -21,13 +21,13 @@ import ( "crypto/sha256" "fmt" "math/big" + "slices" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto/kzg4844" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" "github.com/holiman/uint256" - "slices" ) // BlobTx represents an EIP-4844 transaction. diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index ca83efc083..cceab1edcf 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -19,6 +19,7 @@ package downloader import ( "fmt" "math/big" + "slices" "sync" "sync/atomic" "testing" @@ -38,7 +39,6 @@ import ( "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/trie" - "slices" ) // downloadTester is a test simulator for mocking out local block chain. diff --git a/eth/downloader/skeleton.go b/eth/downloader/skeleton.go index 1907d11c01..dd5dab1963 100644 --- a/eth/downloader/skeleton.go +++ b/eth/downloader/skeleton.go @@ -24,13 +24,14 @@ import ( "sort" "time" + "slices" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/rawdb" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/eth/protocols/eth" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/log" - "slices" ) // scratchHeaders is the number of headers to store in a scratch space to allow diff --git a/eth/downloader/skeleton_test.go b/eth/downloader/skeleton_test.go index d8b1c4e764..8ba1cd2fe4 100644 --- a/eth/downloader/skeleton_test.go +++ b/eth/downloader/skeleton_test.go @@ -25,13 +25,14 @@ import ( "testing" "time" + "slices" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/rawdb" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/eth/protocols/eth" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/log" - "slices" ) // hookedBackfiller is a tester backfiller with all interface methods mocked and diff --git a/eth/downloader/testchain_test.go b/eth/downloader/testchain_test.go index 7c2c4f22d2..308547cc94 100644 --- a/eth/downloader/testchain_test.go +++ b/eth/downloader/testchain_test.go @@ -19,6 +19,7 @@ package downloader import ( "fmt" "math/big" + "slices" "sync" "time" @@ -31,7 +32,6 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/triedb" - "slices" ) // Test chain parameters. diff --git a/eth/protocols/snap/sync.go b/eth/protocols/snap/sync.go index 995fcc4748..9f0105d26e 100644 --- a/eth/protocols/snap/sync.go +++ b/eth/protocols/snap/sync.go @@ -24,6 +24,7 @@ import ( gomath "math" "math/big" "math/rand" + "slices" "sort" "sync" "sync/atomic" @@ -42,7 +43,6 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/trie" "github.com/ethereum/go-ethereum/trie/trienode" - "slices" ) const ( diff --git a/eth/tracers/native/4byte.go b/eth/tracers/native/4byte.go index 53afd6e6e1..165cd5c954 100644 --- a/eth/tracers/native/4byte.go +++ b/eth/tracers/native/4byte.go @@ -19,6 +19,7 @@ package native import ( "encoding/json" "math/big" + "slices" "strconv" "sync/atomic" @@ -28,7 +29,6 @@ import ( "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/eth/tracers" "github.com/ethereum/go-ethereum/params" - "slices" ) func init() { diff --git a/p2p/discover/v4_udp_test.go b/p2p/discover/v4_udp_test.go index 2adac1dffb..8a2b61213d 100644 --- a/p2p/discover/v4_udp_test.go +++ b/p2p/discover/v4_udp_test.go @@ -28,6 +28,7 @@ import ( "net" "net/netip" "reflect" + "slices" "sync" "testing" "time" @@ -37,7 +38,6 @@ import ( "github.com/ethereum/go-ethereum/p2p/discover/v4wire" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enr" - "slices" ) // shared test variables diff --git a/trie/sync.go b/trie/sync.go index 42714393ab..07369f2199 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -19,6 +19,7 @@ package trie import ( "errors" "fmt" + "slices" "sync" "github.com/ethereum/go-ethereum/common" @@ -30,7 +31,6 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/metrics" - "slices" ) // ErrNotRequested is returned by the trie sync when it's requested to process a