Merge branch 'main' into feature-20074

cosmos · Apr 22, 2024 · 3a4385f · 3a4385f
2 parents ee64706 + f31a6a3
commit 3a4385f
Show file tree

Hide file tree

Showing 81 changed files with 87 additions and 87 deletions.
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ The version matrix below shows which versions of the Cosmos SDK, modules and lib
 
 #### Core Dependencies
 
-Core Dependencies are the core libraries that a application may depend on.
+Core Dependencies are the core libraries that an application may depend on.
 
 > Note: the ❌ signals that the version of the Cosmos SDK does not need to import the dependency.
 

diff --git a/client/debug/main.go b/client/debug/main.go
@@ -17,7 +17,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
-	legacybech32 "github.com/cosmos/cosmos-sdk/types/bech32/legacybech32" //nolint:staticcheck // we do old keys, they're keys after all.
+	"github.com/cosmos/cosmos-sdk/types/bech32/legacybech32" //nolint:staticcheck // we do old keys, they're keys after all.
 	"github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/version"
 )

diff --git a/client/grpc/node/service.go b/client/grpc/node/service.go
@@ -1,7 +1,7 @@
 package node
 
 import (
-	context "context"
+	"context"
 
 	gogogrpc "github.com/cosmos/gogoproto/grpc"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"

diff --git a/client/input/input.go b/client/input/input.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/bgentry/speakeasy"
-	isatty "github.com/mattn/go-isatty"
+	"github.com/mattn/go-isatty"
 )
 
 // MinPassLength is the minimum acceptable password length

diff --git a/codec/amino.go b/codec/amino.go
@@ -8,7 +8,7 @@ import (
 	"io"
 
 	cmttypes "github.com/cometbft/cometbft/types"
-	amino "github.com/tendermint/go-amino"
+	"github.com/tendermint/go-amino"
 
 	"github.com/cosmos/cosmos-sdk/codec/types"
 )

diff --git a/collections/collections.go b/collections/collections.go
@@ -3,7 +3,7 @@ package collections
 import (
 	"context"
 	"errors"
-	io "io"
+	"io"
 	"math"
 
 	"cosmossdk.io/collections/codec"

diff --git a/core/appmodule/genesis.go b/core/appmodule/genesis.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	appmodule "cosmossdk.io/core/appmodule/v2"
+	"cosmossdk.io/core/appmodule/v2"
 )
 
 // HasGenesis defines a custom genesis handling API implementation.

diff --git a/crypto/keys/multisig/amino.go b/crypto/keys/multisig/amino.go
@@ -3,7 +3,7 @@ package multisig
 import (
 	errorsmod "cosmossdk.io/errors"
 
-	types "github.com/cosmos/cosmos-sdk/codec/types"
+	"github.com/cosmos/cosmos-sdk/codec/types"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )

diff --git a/crypto/keys/multisig/multisig.go b/crypto/keys/multisig/multisig.go
@@ -1,7 +1,7 @@
 package multisig
 
 import (
-	fmt "fmt"
+	"fmt"
 
 	cmtcrypto "github.com/cometbft/cometbft/crypto"
 

diff --git a/crypto/keys/secp256k1/secp256k1_nocgo.go b/crypto/keys/secp256k1/secp256k1_nocgo.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 
 	"github.com/cometbft/cometbft/crypto"
-	secp256k1 "github.com/decred/dcrd/dcrec/secp256k1/v4"
+	"github.com/decred/dcrd/dcrec/secp256k1/v4"
 	"github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa"
 )
 

diff --git a/crypto/keys/secp256r1/pubkey.go b/crypto/keys/secp256r1/pubkey.go
@@ -6,7 +6,7 @@ import (
 	cmtcrypto "github.com/cometbft/cometbft/crypto"
 	"github.com/cosmos/gogoproto/proto"
 
-	ecdsa "github.com/cosmos/cosmos-sdk/crypto/keys/internal/ecdsa"
+	"github.com/cosmos/cosmos-sdk/crypto/keys/internal/ecdsa"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 )
 

diff --git a/crypto/keys/secp256r1/pubkey_internal_test.go b/crypto/keys/secp256r1/pubkey_internal_test.go
@@ -3,7 +3,7 @@ package secp256r1
 import (
 	"testing"
 
-	proto "github.com/cosmos/gogoproto/proto"
+	"github.com/cosmos/gogoproto/proto"
 	"github.com/stretchr/testify/suite"
 
 	"github.com/cosmos/cosmos-sdk/codec"

diff --git a/crypto/types/types.go b/crypto/types/types.go
@@ -2,7 +2,7 @@ package types
 
 import (
 	cmtcrypto "github.com/cometbft/cometbft/crypto"
-	proto "github.com/cosmos/gogoproto/proto"
+	"github.com/cosmos/gogoproto/proto"
 )
 
 // PubKey defines a public key and extends proto.Message.

diff --git a/depinject/appconfig/config.go b/depinject/appconfig/config.go
@@ -7,7 +7,7 @@ import (
 	"github.com/cosmos/cosmos-proto/anyutil"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/reflect/protoregistry"
 	"google.golang.org/protobuf/types/known/anypb"
 	"sigs.k8s.io/yaml"

diff --git a/fuzz/tests/crypto_hd_deriveprivatekeyforpath_test.go b/fuzz/tests/crypto_hd_deriveprivatekeyforpath_test.go
@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"testing"
 
-	bip39 "github.com/cosmos/go-bip39"
+	"github.com/cosmos/go-bip39"
 
 	"github.com/cosmos/cosmos-sdk/crypto/hd"
 )

diff --git a/fuzz/tests/tendermint_amino_decodetime_test.go b/fuzz/tests/tendermint_amino_decodetime_test.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	amino "github.com/tendermint/go-amino"
+	"github.com/tendermint/go-amino"
 )
 
 func FuzzTendermintAminoDecodeTime(f *testing.F) {

diff --git a/orm/encoding/ormfield/bool.go b/orm/encoding/ormfield/bool.go
@@ -1,7 +1,7 @@
 package ormfield
 
 import (
-	io "io"
+	"io"
 
 	"google.golang.org/protobuf/reflect/protoreflect"
 )

diff --git a/orm/encoding/ormfield/duration.go b/orm/encoding/ormfield/duration.go
@@ -2,7 +2,7 @@ package ormfield
 
 import (
 	"fmt"
-	io "io"
+	"io"
 
 	"google.golang.org/protobuf/reflect/protoreflect"
 )

diff --git a/orm/encoding/ormfield/enum.go b/orm/encoding/ormfield/enum.go
@@ -2,7 +2,7 @@ package ormfield
 
 import (
 	"encoding/binary"
-	io "io"
+	"io"
 
 	"google.golang.org/protobuf/reflect/protoreflect"
 )

diff --git a/orm/encoding/ormfield/int32.go b/orm/encoding/ormfield/int32.go
@@ -2,7 +2,7 @@ package ormfield
 
 import (
 	"encoding/binary"
-	io "io"
+	"io"
 
 	"google.golang.org/protobuf/reflect/protoreflect"
 )

diff --git a/orm/encoding/ormfield/int64.go b/orm/encoding/ormfield/int64.go
@@ -2,7 +2,7 @@ package ormfield
 
 import (
 	"encoding/binary"
-	io "io"
+	"io"
 
 	"google.golang.org/protobuf/reflect/protoreflect"
 )

diff --git a/orm/encoding/ormkv/unique_key_test.go b/orm/encoding/ormkv/unique_key_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	"google.golang.org/protobuf/reflect/protoreflect"
 	"gotest.tools/v3/assert"
 	"pgregory.net/rapid"
 

diff --git a/server/cmt_cmds.go b/server/cmt_cmds.go
@@ -22,7 +22,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"
-	rpc "github.com/cosmos/cosmos-sdk/client/rpc"
+	"github.com/cosmos/cosmos-sdk/client/rpc"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	"github.com/cosmos/cosmos-sdk/server/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"

diff --git a/store/commitment/iavl/tree.go b/store/commitment/iavl/tree.go
@@ -6,7 +6,7 @@ import (
 	"github.com/cosmos/iavl"
 	ics23 "github.com/cosmos/ics23/go"
 
-	log "cosmossdk.io/log"
+	"cosmossdk.io/log"
 	"cosmossdk.io/store/v2"
 	"cosmossdk.io/store/v2/commitment"
 	dbm "cosmossdk.io/store/v2/db"

diff --git a/store/snapshots/types/convert.go b/store/snapshots/types/convert.go
@@ -2,7 +2,7 @@ package types
 
 import (
 	abci "github.com/cometbft/cometbft/abci/types"
-	proto "github.com/cosmos/gogoproto/proto"
+	"github.com/cosmos/gogoproto/proto"
 
 	"cosmossdk.io/errors"
 )

diff --git a/telemetry/wrapper.go b/telemetry/wrapper.go
@@ -90,7 +90,7 @@ func SetGaugeWithLabels(keys []string, val float32, labels []metrics.Label) {
 	metrics.SetGaugeWithLabels(keys, val, append(labels, globalLabels...))
 }
 
-// MeasureSince provides a wrapper functionality for emitting a a time measure
+// MeasureSince provides a wrapper functionality for emitting a time measure
 // metric with global labels (if any).
 func MeasureSince(start time.Time, keys ...string) {
 	if !IsTelemetryEnabled() {

diff --git a/tests/integration/staking/keeper/vote_extensions_test.go b/tests/integration/staking/keeper/vote_extensions_test.go
@@ -18,7 +18,7 @@ import (
 	stakingtypes "cosmossdk.io/x/staking/types"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
-	ed25519 "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
+	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"

diff --git a/testutil/mock/types_handler.go b/testutil/mock/types_handler.go
diff --git a/testutil/testdata/codec.go b/testutil/testdata/codec.go
@@ -1,12 +1,12 @@
 package testdata
 
 import (
-	amino "github.com/tendermint/go-amino"
+	"github.com/tendermint/go-amino"
 
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/msgservice"
-	tx "github.com/cosmos/cosmos-sdk/types/tx"
+	"github.com/cosmos/cosmos-sdk/types/tx"
 )
 
 func NewTestInterfaceRegistry() types.InterfaceRegistry {

diff --git a/testutil/testdata/grpc_query.go b/testutil/testdata/grpc_query.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/cosmos/gogoproto/proto"
-	grpc "google.golang.org/grpc"
+	"google.golang.org/grpc"
 	"gotest.tools/v3/assert"
 
 	"github.com/cosmos/cosmos-sdk/codec/types"

diff --git a/tools/hubl/internal/compat.go b/tools/hubl/internal/compat.go
@@ -9,7 +9,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection/grpc_reflection_v1alpha"
 	"google.golang.org/protobuf/proto"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/reflect/protoregistry"
 	"google.golang.org/protobuf/types/descriptorpb"
 

diff --git a/types/events.go b/types/events.go
@@ -9,7 +9,7 @@ import (
 
 	abci "github.com/cometbft/cometbft/abci/types"
 	"github.com/cosmos/gogoproto/jsonpb"
-	proto "github.com/cosmos/gogoproto/proto"
+	"github.com/cosmos/gogoproto/proto"
 	"golang.org/x/exp/maps"
 
 	"github.com/cosmos/cosmos-sdk/codec"

diff --git a/types/events_test.go b/types/events_test.go
@@ -11,7 +11,7 @@ import (
 	"cosmossdk.io/math"
 
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	testdata "github.com/cosmos/cosmos-sdk/testutil/testdata"
+	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 

diff --git a/types/mempool/sender_nonce_property_test.go b/types/mempool/sender_nonce_property_test.go
@@ -11,7 +11,7 @@ import (
 
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	mempool "github.com/cosmos/cosmos-sdk/types/mempool"
+	"github.com/cosmos/cosmos-sdk/types/mempool"
 )
 
 var (

diff --git a/types/query/filtered_pagination.go b/types/query/filtered_pagination.go
@@ -3,7 +3,7 @@ package query
 import (
 	"fmt"
 
-	proto "github.com/cosmos/gogoproto/proto"
+	"github.com/cosmos/gogoproto/proto"
 
 	"cosmossdk.io/store/types"
 

diff --git a/types/tx/msgs.go b/types/tx/msgs.go
@@ -1,7 +1,7 @@
 package tx
 
 import (
-	fmt "fmt"
+	"fmt"
 
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"

diff --git a/types/tx_msg.go b/types/tx_msg.go
@@ -2,8 +2,8 @@ package types
 
 import (
 	"encoding/json"
-	fmt "fmt"
-	strings "strings"
+	"fmt"
+	"strings"
 
 	"github.com/cosmos/gogoproto/proto"
 	protov2 "google.golang.org/protobuf/proto"

diff --git a/version/version_test.go b/version/version_test.go
@@ -1,7 +1,7 @@
 package version_test
 
 import (
-	context "context"
+	"context"
 	"encoding/json"
 	"fmt"
 	"runtime"

diff --git a/x/accounts/defaults/lockup/types/encoding.go b/x/accounts/defaults/lockup/types/encoding.go
@@ -1,11 +1,11 @@
 package types
 
 import (
-	fmt "fmt"
+	"fmt"
 	"reflect"
 	"strings"
 
-	proto "github.com/cosmos/gogoproto/proto"
+	"github.com/cosmos/gogoproto/proto"
 
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 )

diff --git a/x/auth/tx/gogotx.go b/x/auth/tx/gogotx.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/cosmos/gogoproto/proto"
 	protov2 "google.golang.org/protobuf/proto"
-	anypb "google.golang.org/protobuf/types/known/anypb"
+	"google.golang.org/protobuf/types/known/anypb"
 
 	"cosmossdk.io/core/address"
 	errorsmod "cosmossdk.io/errors"

diff --git a/x/auth/types/account_retriever.go b/x/auth/types/account_retriever.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
-	grpc "google.golang.org/grpc"
+	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"

diff --git a/x/auth/types/genesis.go b/x/auth/types/genesis.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"sort"
 
-	proto "github.com/cosmos/gogoproto/proto"
+	"github.com/cosmos/gogoproto/proto"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/types"