reorg imports to make linter happy. (#712)

persistenceOne · Jan 3, 2024 · 2999051 · 2999051
1 parent d7f3083
commit 2999051
Show file tree

Hide file tree

Showing 41 changed files with 73 additions and 66 deletions.
diff --git a/app/encoding.go b/app/encoding.go
@@ -1,9 +1,9 @@
 package app
 
 import (
-	"github.com/persistenceOne/pstake-native/v2/app/params"
-
 	"github.com/cosmos/cosmos-sdk/std"
+
+	"github.com/persistenceOne/pstake-native/v2/app/params"
 )
 
 // MakeEncodingConfig creates an EncodingConfig for testing

diff --git a/app/export.go b/app/export.go
@@ -5,7 +5,6 @@ import (
 	"log"
 
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
-
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"

diff --git a/app/sim_test.go b/app/sim_test.go
@@ -6,20 +6,19 @@ import (
 	"os"
 	"testing"
 
-	pstake "github.com/persistenceOne/pstake-native/v2/app"
-
 	dbm "github.com/cometbft/cometbft-db"
 	"github.com/cometbft/cometbft/libs/log"
 	"github.com/cometbft/cometbft/libs/rand"
-	"github.com/persistenceOne/pstake-native/v2/app/helpers"
-	"github.com/stretchr/testify/require"
-
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/store"
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	"github.com/cosmos/cosmos-sdk/x/simulation"
 	simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
+	"github.com/stretchr/testify/require"
+
+	pstake "github.com/persistenceOne/pstake-native/v2/app"
+	"github.com/persistenceOne/pstake-native/v2/app/helpers"
 )
 
 func init() {

diff --git a/cmd/pstaked/cmd/genaccounts.go b/cmd/pstaked/cmd/genaccounts.go
@@ -6,8 +6,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/spf13/cobra"
-
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
@@ -18,6 +16,7 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
+	"github.com/spf13/cobra"
 )
 
 const (

diff --git a/cmd/pstaked/cmd/testnet.go b/cmd/pstaked/cmd/testnet.go
@@ -15,9 +15,6 @@ import (
 	tmrand "github.com/cometbft/cometbft/libs/rand"
 	"github.com/cometbft/cometbft/types"
 	tmtime "github.com/cometbft/cometbft/types/time"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
@@ -36,6 +33,8 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
 	ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 
 	"github.com/persistenceOne/pstake-native/v2/app/params"
 )

diff --git a/cmd/pstaked/main.go b/cmd/pstaked/main.go
@@ -6,6 +6,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/server"
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 	sdkTypes "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/persistenceOne/pstake-native/v2/app"
 	"github.com/persistenceOne/pstake-native/v2/cmd/pstaked/cmd"
 )

diff --git a/interchaintest/setup.go b/interchaintest/setup.go
@@ -5,17 +5,16 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/docker/docker/client"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/zap/zaptest"
-
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	testutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 	ibclocalhost "github.com/cosmos/ibc-go/v7/modules/light-clients/09-localhost"
+	"github.com/docker/docker/client"
 	interchaintest "github.com/strangelove-ventures/interchaintest/v7"
 	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v7/ibc"
 	"github.com/strangelove-ventures/interchaintest/v7/testreporter"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/zap/zaptest"
 )
 
 var (

diff --git a/x/liquidstake/client/cli/query.go b/x/liquidstake/client/cli/query.go
@@ -4,11 +4,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/spf13/cobra"
-
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/version"
+	"github.com/spf13/cobra"
 
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstake/types"
 )

diff --git a/x/liquidstake/client/cli/tx.go b/x/liquidstake/client/cli/tx.go
@@ -9,13 +9,12 @@ import (
 	"os"
 	"strings"
 
-	"github.com/spf13/cobra"
-
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/version"
+	"github.com/spf13/cobra"
 
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstake/types"
 )

diff --git a/x/liquidstake/keeper/grpc_query.go b/x/liquidstake/keeper/grpc_query.go
@@ -3,11 +3,10 @@ package keeper
 import (
 	"context"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
-
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstake/types"
 )
 

diff --git a/x/liquidstake/keeper/grpc_query_test.go b/x/liquidstake/keeper/grpc_query_test.go
@@ -2,12 +2,11 @@ package keeper_test
 
 import (
 	"cosmossdk.io/math"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/stretchr/testify/suite"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
-
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstake/types"
 )
 

diff --git a/x/liquidstake/keeper/keeper_test.go b/x/liquidstake/keeper/keeper_test.go
@@ -6,8 +6,6 @@ import (
 	"time"
 
 	"cosmossdk.io/math"
-	"github.com/stretchr/testify/suite"
-
 	abci "github.com/cometbft/cometbft/abci/types"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
@@ -17,11 +15,12 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
+	"github.com/cosmos/cosmos-sdk/x/mint"
+	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	"github.com/stretchr/testify/suite"
 
-	"github.com/cosmos/cosmos-sdk/x/mint"
-	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	chain "github.com/persistenceOne/pstake-native/v2/app"
 	testhelpers "github.com/persistenceOne/pstake-native/v2/app/helpers"
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstake"

diff --git a/x/liquidstake/keeper/liquidstake.go b/x/liquidstake/keeper/liquidstake.go
@@ -6,11 +6,11 @@ import (
 
 	"cosmossdk.io/errors"
 	"cosmossdk.io/math"
+	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstake/types"
 )
 

diff --git a/x/liquidstake/module.go b/x/liquidstake/module.go
@@ -6,15 +6,14 @@ import (
 	"fmt"
 
 	abci "github.com/cometbft/cometbft/abci/types"
-	"github.com/gorilla/mux"
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
-	"github.com/spf13/cobra"
-
 	sdkclient "github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
+	"github.com/gorilla/mux"
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"github.com/spf13/cobra"
 
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstake/client/cli"
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstake/keeper"

diff --git a/x/liquidstakeibc/keeper/abci_test.go b/x/liquidstakeibc/keeper/abci_test.go
@@ -1,12 +1,14 @@
 package keeper_test
 
 import (
+	"time"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types"
-	"time"
 )
 
 func (suite *IntegrationTestSuite) TestKeeper_BeginBlockCode() {

diff --git a/x/liquidstakeibc/keeper/deposit.go b/x/liquidstakeibc/keeper/deposit.go
@@ -1,9 +1,9 @@
 package keeper
 
 import (
-	errorsmod "cosmossdk.io/errors"
 	"strconv"
 
+	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/math"
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"

diff --git a/x/liquidstakeibc/keeper/grpc_querier.go b/x/liquidstakeibc/keeper/grpc_querier.go
@@ -3,13 +3,12 @@ package keeper
 import (
 	"context"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
-
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types"
 )
 

diff --git a/x/liquidstakeibc/keeper/invariants_test.go b/x/liquidstakeibc/keeper/invariants_test.go
@@ -2,6 +2,7 @@ package keeper_test
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/keeper"
 )
 

diff --git a/x/liquidstakeibc/keeper/keeper_test.go b/x/liquidstakeibc/keeper/keeper_test.go
@@ -9,6 +9,7 @@ import (
 	commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types"
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 	solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine"
+
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types"
 )
 

diff --git a/x/liquidstakeibc/keeper/msg_server_test.go b/x/liquidstakeibc/keeper/msg_server_test.go
@@ -7,7 +7,6 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	ibctfrtypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
-
 	transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
 
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/keeper"

diff --git a/x/liquidstakeibc/keeper/rebalance_test.go b/x/liquidstakeibc/keeper/rebalance_test.go
@@ -1,12 +1,14 @@
 package keeper_test
 
 import (
+	"testing"
+
 	"cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/cosmos/gogoproto/proto"
+
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types"
-	"testing"
 )
 
 func (suite *IntegrationTestSuite) TestKeeper_Rebalance() {

diff --git a/x/liquidstakeibc/keeper/redelegation.go b/x/liquidstakeibc/keeper/redelegation.go
@@ -4,6 +4,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types"
 )
 

diff --git a/x/liquidstakeibc/keeper/redelegation_txs.go b/x/liquidstakeibc/keeper/redelegation_txs.go
@@ -3,6 +3,7 @@ package keeper
 import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types"
 )
 

diff --git a/x/liquidstakeibc/types/hooks.go b/x/liquidstakeibc/types/hooks.go
@@ -2,7 +2,6 @@ package types
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-
 	"github.com/persistenceOne/persistence-sdk/v2/utils"
 )
 

diff --git a/x/ratesync/genesis.go b/x/ratesync/genesis.go
@@ -2,6 +2,7 @@ package ratesync
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/persistenceOne/pstake-native/v2/x/ratesync/keeper"
 	"github.com/persistenceOne/pstake-native/v2/x/ratesync/types"
 )

diff --git a/x/ratesync/genesis_test.go b/x/ratesync/genesis_test.go
@@ -1,13 +1,13 @@
 package ratesync_test
 
 import (
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/persistenceOne/pstake-native/v2/app/helpers"
-	liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types"
 	"testing"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
+	"github.com/persistenceOne/pstake-native/v2/app/helpers"
+	liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types"
 	"github.com/persistenceOne/pstake-native/v2/x/ratesync"
 	"github.com/persistenceOne/pstake-native/v2/x/ratesync/types"
 )

diff --git a/x/ratesync/keeper/chain_test.go b/x/ratesync/keeper/chain_test.go
@@ -1,14 +1,14 @@
 package keeper_test
 
 import (
-	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
-	liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types"
 	"strconv"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+
+	liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types"
 	"github.com/persistenceOne/pstake-native/v2/x/ratesync/keeper"
 	"github.com/persistenceOne/pstake-native/v2/x/ratesync/types"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 // Prevent strconv unused error

diff --git a/x/ratesync/keeper/hooks.go b/x/ratesync/keeper/hooks.go
@@ -5,6 +5,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	epochtypes "github.com/persistenceOne/persistence-sdk/v2/x/epochs/types"
+
 	liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types"
 	"github.com/persistenceOne/pstake-native/v2/x/ratesync/types"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ package keeper_test @@
     import (
     	sdk "github.com/cosmos/cosmos-sdk/types"
     	"github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/keeper"
     )
@@ Expand Down @@