diff --git a/protocol/common/message_segmentation_test.go b/protocol/common/message_segmentation_test.go index 3f9418f660c..65245c037e7 100644 --- a/protocol/common/message_segmentation_test.go +++ b/protocol/common/message_segmentation_test.go @@ -3,18 +3,17 @@ package common import ( "fmt" "math" + "slices" "testing" - "github.com/stretchr/testify/suite" - "go.uber.org/zap" - "golang.org/x/exp/slices" - "github.com/status-im/status-go/appdatabase" "github.com/status-im/status-go/eth-node/crypto" "github.com/status-im/status-go/protocol/sqlite" "github.com/status-im/status-go/protocol/v1" "github.com/status-im/status-go/t/helpers" wakutypes "github.com/status-im/status-go/waku/types" + "github.com/stretchr/testify/suite" + "go.uber.org/zap" ) func TestMessageSegmentationSuite(t *testing.T) { diff --git a/protocol/communities/community.go b/protocol/communities/community.go index c7c82916dde..32aa1fe6149 100644 --- a/protocol/communities/community.go +++ b/protocol/communities/community.go @@ -8,15 +8,12 @@ import ( "fmt" "math" "math/big" + "slices" "sync" "time" - "github.com/golang/protobuf/proto" - "go.uber.org/zap" - slices "golang.org/x/exp/slices" - "github.com/ethereum/go-ethereum/common/hexutil" - + "github.com/golang/protobuf/proto" "github.com/status-im/status-go/api/multiformat" utils "github.com/status-im/status-go/common" "github.com/status-im/status-go/eth-node/crypto" @@ -29,6 +26,7 @@ import ( "github.com/status-im/status-go/protocol/requests" "github.com/status-im/status-go/protocol/v1" "github.com/status-im/status-go/server" + "go.uber.org/zap" ) const signatureLength = 65 diff --git a/protocol/communities/community_changes.go b/protocol/communities/community_changes.go index a0b1bdbd778..3baeb394c61 100644 --- a/protocol/communities/community_changes.go +++ b/protocol/communities/community_changes.go @@ -3,8 +3,7 @@ package communities import ( "bytes" "crypto/ecdsa" - - slices "golang.org/x/exp/slices" + "slices" "github.com/status-im/status-go/protocol/protobuf" ) diff --git a/protocol/communities/permission_checker.go b/protocol/communities/permission_checker.go index a5a9557340b..dfad33d9592 100644 --- a/protocol/communities/permission_checker.go +++ b/protocol/communities/permission_checker.go @@ -4,21 +4,19 @@ import ( "context" "errors" "fmt" + "maps" "math/big" + "slices" "strconv" "strings" - "go.uber.org/zap" - - maps "golang.org/x/exp/maps" - slices "golang.org/x/exp/slices" - gethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/status-im/status-go/protocol/ens" "github.com/status-im/status-go/protocol/protobuf" walletcommon "github.com/status-im/status-go/services/wallet/common" "github.com/status-im/status-go/services/wallet/thirdparty" + "go.uber.org/zap" ) type PermissionChecker interface { diff --git a/protocol/communities/roles_authorization.go b/protocol/communities/roles_authorization.go index d32a3a05cdf..9f75fe886fb 100644 --- a/protocol/communities/roles_authorization.go +++ b/protocol/communities/roles_authorization.go @@ -1,7 +1,7 @@ package communities import ( - "golang.org/x/exp/slices" + "slices" "github.com/status-im/status-go/protocol/protobuf" ) diff --git a/protocol/messenger_communities.go b/protocol/messenger_communities.go index b22bca1ee66..08645103ae2 100644 --- a/protocol/messenger_communities.go +++ b/protocol/messenger_communities.go @@ -7,11 +7,11 @@ import ( "encoding/json" "errors" "fmt" + "slices" "strings" "sync" "time" - "golang.org/x/exp/slices" "golang.org/x/time/rate" "github.com/golang/protobuf/proto" diff --git a/services/wallet/transfer/commands_sequential_test.go b/services/wallet/transfer/commands_sequential_test.go index 3d7197d7983..d74fdb6d0ab 100644 --- a/services/wallet/transfer/commands_sequential_test.go +++ b/services/wallet/transfer/commands_sequential_test.go @@ -4,30 +4,22 @@ import ( "context" "fmt" "math/big" + "slices" "sort" "strings" "sync" "testing" "time" - "github.com/status-im/status-go/contracts" - "github.com/status-im/status-go/services/wallet/blockchainstate" - "github.com/status-im/status-go/t/utils" - - "github.com/pkg/errors" - "github.com/stretchr/testify/mock" - "go.uber.org/mock/gomock" - "golang.org/x/exp/slices" // since 1.21, this is in the standard library - - "github.com/stretchr/testify/require" - "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/rpc" + "github.com/pkg/errors" "github.com/status-im/status-go/appdatabase" + "github.com/status-im/status-go/contracts" "github.com/status-im/status-go/contracts/balancechecker" "github.com/status-im/status-go/contracts/ethscan" "github.com/status-im/status-go/contracts/ierc20" @@ -44,12 +36,17 @@ import ( "github.com/status-im/status-go/server" "github.com/status-im/status-go/services/wallet/async" "github.com/status-im/status-go/services/wallet/balance" + "github.com/status-im/status-go/services/wallet/blockchainstate" walletcommon "github.com/status-im/status-go/services/wallet/common" "github.com/status-im/status-go/services/wallet/community" "github.com/status-im/status-go/services/wallet/token" "github.com/status-im/status-go/t/helpers" + "github.com/status-im/status-go/t/utils" "github.com/status-im/status-go/transactions" "github.com/status-im/status-go/walletdatabase" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" ) type TestClient struct { diff --git a/services/wallet/transfer/controller.go b/services/wallet/transfer/controller.go index f07f16706a2..799edbfa744 100644 --- a/services/wallet/transfer/controller.go +++ b/services/wallet/transfer/controller.go @@ -5,9 +5,7 @@ import ( "database/sql" "fmt" "math/big" - - "go.uber.org/zap" - "golang.org/x/exp/slices" // since 1.21, this is in the standard library + "slices" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" @@ -22,6 +20,7 @@ import ( "github.com/status-im/status-go/services/wallet/blockchainstate" "github.com/status-im/status-go/services/wallet/token" "github.com/status-im/status-go/transactions" + "go.uber.org/zap" ) type Controller struct { diff --git a/services/wallet/transfer/downloader.go b/services/wallet/transfer/downloader.go index 71fd37dc11c..bc2e20a033c 100644 --- a/services/wallet/transfer/downloader.go +++ b/services/wallet/transfer/downloader.go @@ -4,15 +4,14 @@ import ( "context" "errors" "math/big" + "slices" "time" - "go.uber.org/zap" - "golang.org/x/exp/slices" // since 1.21, this is in the standard library - "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" + "go.uber.org/zap" "github.com/status-im/status-go/logutils" "github.com/status-im/status-go/rpc/chain"