chore: make format

Finschia · Sep 11, 2023 · 8617ed1 · 8617ed1
1 parent 8b07189
commit 8617ed1
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 60 deletions.
diff --git a/ante/ante.go b/ante/ante.go
@@ -1,13 +1,14 @@
 package ante
 
 import (
+	ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante"
+	ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
+
 	sdk "github.com/Finschia/finschia-sdk/types"
 	sdkerrors "github.com/Finschia/finschia-sdk/types/errors"
 	"github.com/Finschia/finschia-sdk/x/auth/ante"
 	wasmkeeper "github.com/Finschia/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/Finschia/wasmd/x/wasm/types"
-	ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante"
-	ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
 )
 
 // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC

diff --git a/ante/ante_test.go b/ante/ante_test.go
@@ -7,8 +7,6 @@ import (
 	"github.com/stretchr/testify/suite"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	ocrand "github.com/Finschia/ostracon/libs/rand"
-
 	"github.com/Finschia/finschia-sdk/client"
 	"github.com/Finschia/finschia-sdk/client/tx"
 	cryptotypes "github.com/Finschia/finschia-sdk/crypto/types"
@@ -17,6 +15,7 @@ import (
 	sdk "github.com/Finschia/finschia-sdk/types"
 	"github.com/Finschia/finschia-sdk/types/tx/signing"
 	xauthsigning "github.com/Finschia/finschia-sdk/x/auth/signing"
+	ocrand "github.com/Finschia/ostracon/libs/rand"
 
 	linkapp "github.com/Finschia/finschia/app"
 	linkhelpers "github.com/Finschia/finschia/app/helpers"

diff --git a/app/app.go b/app/app.go
@@ -9,12 +9,23 @@ import (
 	"os"
 	"path/filepath"
 
+	ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts"
+	icahost "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host"
+	icahostkeeper "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/keeper"
+	icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types"
+	icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types"
+	"github.com/cosmos/ibc-go/v4/modules/apps/transfer"
+	ibctransferkeeper "github.com/cosmos/ibc-go/v4/modules/apps/transfer/keeper"
+	ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
+	ibc "github.com/cosmos/ibc-go/v4/modules/core"
+	ibcclient "github.com/cosmos/ibc-go/v4/modules/core/02-client"
+	ibcclientclient "github.com/cosmos/ibc-go/v4/modules/core/02-client/client"
+	ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types"
+	porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types"
+	ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host"
+	ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
 	"github.com/gorilla/mux"
 	"github.com/rakyll/statik/fs"
-
-	ocabci "github.com/Finschia/ostracon/abci/types"
-	"github.com/Finschia/ostracon/libs/log"
-	ostos "github.com/Finschia/ostracon/libs/os"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	dbm "github.com/tendermint/tm-db"
@@ -101,32 +112,18 @@ import (
 	upgradeclient "github.com/Finschia/finschia-sdk/x/upgrade/client"
 	upgradekeeper "github.com/Finschia/finschia-sdk/x/upgrade/keeper"
 	upgradetypes "github.com/Finschia/finschia-sdk/x/upgrade/types"
+	ocabci "github.com/Finschia/ostracon/abci/types"
+	"github.com/Finschia/ostracon/libs/log"
+	ostos "github.com/Finschia/ostracon/libs/os"
 	"github.com/Finschia/wasmd/x/wasm"
 	wasmclient "github.com/Finschia/wasmd/x/wasm/client"
 	wasmkeeper "github.com/Finschia/wasmd/x/wasm/keeper"
 	"github.com/Finschia/wasmd/x/wasmplus"
 	wasmpluskeeper "github.com/Finschia/wasmd/x/wasmplus/keeper"
 	wasmplustypes "github.com/Finschia/wasmd/x/wasmplus/types"
-	ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts"
-	icahost "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host"
-	icahostkeeper "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/keeper"
-	icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types"
-	icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types"
-	"github.com/cosmos/ibc-go/v4/modules/apps/transfer"
-	ibctransferkeeper "github.com/cosmos/ibc-go/v4/modules/apps/transfer/keeper"
-	ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
-	ibc "github.com/cosmos/ibc-go/v4/modules/core"
-	ibcclient "github.com/cosmos/ibc-go/v4/modules/core/02-client"
-	ibcclientclient "github.com/cosmos/ibc-go/v4/modules/core/02-client/client"
-	ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types"
-	porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types"
-	ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host"
-	ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
 
 	appante "github.com/Finschia/finschia/ante"
 	appparams "github.com/Finschia/finschia/app/params"
-
-	// unnamed import of statik for swagger UI support
 	_ "github.com/Finschia/finschia/client/docs/statik"
 )
 

diff --git a/app/app_test.go b/app/app_test.go
@@ -5,10 +5,10 @@ import (
 	"os"
 	"testing"
 
+	"github.com/cosmos/ibc-go/v4/modules/apps/transfer"
+	ibc "github.com/cosmos/ibc-go/v4/modules/core"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
-
-	"github.com/Finschia/ostracon/libs/log"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	dbm "github.com/tendermint/tm-db"
@@ -32,16 +32,14 @@ import (
 	foundationmodule "github.com/Finschia/finschia-sdk/x/foundation/module"
 	"github.com/Finschia/finschia-sdk/x/genutil"
 	"github.com/Finschia/finschia-sdk/x/gov"
-	"github.com/Finschia/wasmd/x/wasmplus"
-
 	"github.com/Finschia/finschia-sdk/x/mint"
 	"github.com/Finschia/finschia-sdk/x/params"
 	"github.com/Finschia/finschia-sdk/x/slashing"
 	"github.com/Finschia/finschia-sdk/x/staking"
 	tokenmodule "github.com/Finschia/finschia-sdk/x/token/module"
 	"github.com/Finschia/finschia-sdk/x/upgrade"
-	"github.com/cosmos/ibc-go/v4/modules/apps/transfer"
-	ibc "github.com/cosmos/ibc-go/v4/modules/core"
+	"github.com/Finschia/ostracon/libs/log"
+	"github.com/Finschia/wasmd/x/wasmplus"
 )
 
 func TestSimAppExportAndBlockedAddrs(t *testing.T) {

diff --git a/app/genesis_account_test.go b/app/genesis_account_test.go
@@ -6,12 +6,11 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/Finschia/ostracon/crypto"
-
 	"github.com/Finschia/finschia-sdk/crypto/keys/secp256k1"
 	"github.com/Finschia/finschia-sdk/simapp"
 	sdk "github.com/Finschia/finschia-sdk/types"
 	authtypes "github.com/Finschia/finschia-sdk/x/auth/types"
+	"github.com/Finschia/ostracon/crypto"
 )
 
 func TestSimGenesisAccountValidate(t *testing.T) {

diff --git a/cli_test/cli_test.go b/cli_test/cli_test.go
@@ -17,14 +17,13 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	osttypes "github.com/Finschia/ostracon/types"
-
 	"github.com/Finschia/finschia-sdk/client/flags"
 	"github.com/Finschia/finschia-sdk/crypto/keys/ed25519"
 	sdk "github.com/Finschia/finschia-sdk/types"
 	"github.com/Finschia/finschia-sdk/types/tx"
 	gov "github.com/Finschia/finschia-sdk/x/gov/types"
 	minttypes "github.com/Finschia/finschia-sdk/x/mint/types"
+	osttypes "github.com/Finschia/ostracon/types"
 
 	"github.com/Finschia/finschia/app"
 )

diff --git a/cli_test/test_helpers.go b/cli_test/test_helpers.go
@@ -19,8 +19,6 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
 
-	wasmcli "github.com/Finschia/wasmd/x/wasm/client/cli"
-
 	"github.com/Finschia/finschia-sdk/baseapp"
 	"github.com/Finschia/finschia-sdk/client"
 	clientkeys "github.com/Finschia/finschia-sdk/client/keys"
@@ -54,13 +52,13 @@ import (
 	stakingcli "github.com/Finschia/finschia-sdk/x/staking/client/cli"
 	staking "github.com/Finschia/finschia-sdk/x/staking/types"
 	"github.com/Finschia/finschia-sdk/x/stakingplus"
-
 	ostcmd "github.com/Finschia/ostracon/cmd/ostracon/commands"
 	ostcfg "github.com/Finschia/ostracon/config"
 	"github.com/Finschia/ostracon/libs/log"
 	osthttp "github.com/Finschia/ostracon/rpc/client/http"
 	ostctypes "github.com/Finschia/ostracon/rpc/core/types"
 	osttypes "github.com/Finschia/ostracon/types"
+	wasmcli "github.com/Finschia/wasmd/x/wasm/client/cli"
 	wasmtypes "github.com/Finschia/wasmd/x/wasm/types"
 
 	"github.com/Finschia/finschia/app"

diff --git a/cmd/fnsad/cmd/genaccounts_test.go b/cmd/fnsad/cmd/genaccounts_test.go
@@ -3,27 +3,24 @@ package cmd_test
 import (
 	"context"
 	"fmt"
-
 	"testing"
 
-	"github.com/Finschia/finschia-sdk/crypto/hd"
-	"github.com/Finschia/finschia-sdk/crypto/keyring"
-	sdk "github.com/Finschia/finschia-sdk/types"
-
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
 
-	"github.com/Finschia/ostracon/libs/log"
-
 	"github.com/Finschia/finschia-sdk/client"
 	"github.com/Finschia/finschia-sdk/client/flags"
+	"github.com/Finschia/finschia-sdk/crypto/hd"
+	"github.com/Finschia/finschia-sdk/crypto/keyring"
 	"github.com/Finschia/finschia-sdk/server"
 	"github.com/Finschia/finschia-sdk/simapp"
 	simcmd "github.com/Finschia/finschia-sdk/simapp/simd/cmd"
 	"github.com/Finschia/finschia-sdk/testutil/testdata"
+	sdk "github.com/Finschia/finschia-sdk/types"
 	"github.com/Finschia/finschia-sdk/types/module"
 	"github.com/Finschia/finschia-sdk/x/genutil"
 	genutiltest "github.com/Finschia/finschia-sdk/x/genutil/client/testutil"
+	"github.com/Finschia/ostracon/libs/log"
 )
 
 var testMbm = module.NewBasicManager(genutil.AppModuleBasic{})

diff --git a/cmd/fnsad/cmd/root.go b/cmd/fnsad/cmd/root.go
@@ -13,11 +13,6 @@ import (
 	"github.com/spf13/viper"
 	dbm "github.com/tendermint/tm-db"
 
-	ostcli "github.com/Finschia/ostracon/libs/cli"
-	"github.com/Finschia/ostracon/libs/log"
-	"github.com/Finschia/wasmd/x/wasm"
-	wasmkeeper "github.com/Finschia/wasmd/x/wasm/keeper"
-
 	"github.com/Finschia/finschia-sdk/baseapp"
 	"github.com/Finschia/finschia-sdk/client"
 	"github.com/Finschia/finschia-sdk/client/config"
@@ -38,6 +33,10 @@ import (
 	banktypes "github.com/Finschia/finschia-sdk/x/bank/types"
 	"github.com/Finschia/finschia-sdk/x/crisis"
 	genutilcli "github.com/Finschia/finschia-sdk/x/genutil/client/cli"
+	ostcli "github.com/Finschia/ostracon/libs/cli"
+	"github.com/Finschia/ostracon/libs/log"
+	"github.com/Finschia/wasmd/x/wasm"
+	wasmkeeper "github.com/Finschia/wasmd/x/wasm/keeper"
 
 	"github.com/Finschia/finschia/app"
 	"github.com/Finschia/finschia/app/params"

diff --git a/cmd/fnsad/cmd/root_test.go b/cmd/fnsad/cmd/root_test.go
@@ -7,11 +7,10 @@ import (
 	"github.com/stretchr/testify/require"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/Finschia/ostracon/libs/log"
-
 	"github.com/Finschia/finschia-sdk/client/flags"
 	"github.com/Finschia/finschia-sdk/server"
 	"github.com/Finschia/finschia-sdk/store/types"
+	"github.com/Finschia/ostracon/libs/log"
 )
 
 func TestNewApp(t *testing.T) {

diff --git a/cmd/fnsad/cmd/testnet.go b/cmd/fnsad/cmd/testnet.go
@@ -12,12 +12,6 @@ import (
 
 	"github.com/spf13/cobra"
 
-	ostconfig "github.com/Finschia/ostracon/config"
-	ostos "github.com/Finschia/ostracon/libs/os"
-	ostrand "github.com/Finschia/ostracon/libs/rand"
-	"github.com/Finschia/ostracon/types"
-	osttime "github.com/Finschia/ostracon/types/time"
-
 	"github.com/Finschia/finschia-sdk/client"
 	"github.com/Finschia/finschia-sdk/client/flags"
 	"github.com/Finschia/finschia-sdk/client/tx"
@@ -34,6 +28,11 @@ import (
 	"github.com/Finschia/finschia-sdk/x/genutil"
 	genutiltypes "github.com/Finschia/finschia-sdk/x/genutil/types"
 	stakingtypes "github.com/Finschia/finschia-sdk/x/staking/types"
+	ostconfig "github.com/Finschia/ostracon/config"
+	ostos "github.com/Finschia/ostracon/libs/os"
+	ostrand "github.com/Finschia/ostracon/libs/rand"
+	"github.com/Finschia/ostracon/types"
+	osttime "github.com/Finschia/ostracon/types/time"
 )
 
 var (

diff --git a/cmd/fnsad/cmd/testnet_test.go b/cmd/fnsad/cmd/testnet_test.go
@@ -8,14 +8,13 @@ import (
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
 
-	"github.com/Finschia/ostracon/libs/log"
-
 	"github.com/Finschia/finschia-sdk/client"
 	"github.com/Finschia/finschia-sdk/client/flags"
 	"github.com/Finschia/finschia-sdk/server"
 	banktypes "github.com/Finschia/finschia-sdk/x/bank/types"
 	genutiltest "github.com/Finschia/finschia-sdk/x/genutil/client/testutil"
 	genutiltypes "github.com/Finschia/finschia-sdk/x/genutil/types"
+	"github.com/Finschia/ostracon/libs/log"
 
 	"github.com/Finschia/finschia/app"
 )