chore: run goimportssort over the repo (#42)

bnb-chain · Feb 10, 2023 · 6dbd5f0 · 6dbd5f0
1 parent 7783af4
commit 6dbd5f0
Show file tree

Hide file tree

Showing 74 changed files with 200 additions and 118 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -0,0 +1,19 @@
+linters:
+  enable:
+    - gofmt
+    - goimports
+    - errcheck
+    - govet
+    - staticcheck
+
+linters-settings:
+  gofmt:
+    # Simplify code: gofmt with `-s` option.
+    # Default: true
+    simplify: true
+    # Apply the rewrite rules to the source before reformatting.
+    # https://pkg.go.dev/cmd/gofmt
+    # Default: []
+    rewrite-rules:
+      - pattern: 'a[b:len(a)]'
+        replacement: 'a[b:]'
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ ldflags = -X $(REPO)/version.AppVersion=$(VERSION) \
           -X $(REPO)/version.GitCommitDate=$(GIT_COMMIT_DATE)
 
 format:
-	bash format.sh
+	bash scripts/format.sh
 
 tools:
 	curl https://get.ignite.com/cli! | bash

diff --git a/app/app.go b/app/app.go
@@ -91,13 +91,12 @@ import (
 	bridgemodule "github.com/bnb-chain/greenfield/x/bridge"
 	bridgemodulekeeper "github.com/bnb-chain/greenfield/x/bridge/keeper"
 	bridgemoduletypes "github.com/bnb-chain/greenfield/x/bridge/types"
-	spmodule "github.com/bnb-chain/greenfield/x/sp"
-	spmodulekeeper "github.com/bnb-chain/greenfield/x/sp/keeper"
-	spmoduletypes "github.com/bnb-chain/greenfield/x/sp/types"
-
 	paymentmodule "github.com/bnb-chain/greenfield/x/payment"
 	paymentmodulekeeper "github.com/bnb-chain/greenfield/x/payment/keeper"
 	paymentmoduletypes "github.com/bnb-chain/greenfield/x/payment/types"
+	spmodule "github.com/bnb-chain/greenfield/x/sp"
+	spmodulekeeper "github.com/bnb-chain/greenfield/x/sp/keeper"
+	spmoduletypes "github.com/bnb-chain/greenfield/x/sp/types"
 	storagemodule "github.com/bnb-chain/greenfield/x/storage"
 	storagemodulekeeper "github.com/bnb-chain/greenfield/x/storage/keeper"
 	storagemoduletypes "github.com/bnb-chain/greenfield/x/storage/types"

diff --git a/format.sh b/format.sh
diff --git a/go.mod b/go.mod
@@ -228,7 +228,7 @@ require (
 
 replace (
 	github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
-	github.com/cosmos/cosmos-sdk => github.com/bnb-chain/gnfd-cosmos-sdk v0.0.2-0.20230209090945-5a119caf6b3e
+	github.com/cosmos/cosmos-sdk => github.com/bnb-chain/gnfd-cosmos-sdk v0.0.2-0.20230210033000-9e761ce1485e
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	github.com/tendermint/tendermint => github.com/bnb-chain/gnfd-tendermint v0.0.1
 )
diff --git a/go.sum b/go.sum
@@ -218,8 +218,8 @@ github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdn
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
-github.com/bnb-chain/gnfd-cosmos-sdk v0.0.2-0.20230209090945-5a119caf6b3e h1:w2B9A4FlZ24MEtPIcWA6T4tKvCMBSiaYPIT0dkk6wh0=
-github.com/bnb-chain/gnfd-cosmos-sdk v0.0.2-0.20230209090945-5a119caf6b3e/go.mod h1:NlIOmju3uhTOJ2YAzLPidpmh7sAgJ+J9dkUlSysHmjw=
+github.com/bnb-chain/gnfd-cosmos-sdk v0.0.2-0.20230210033000-9e761ce1485e h1:9IpmZ88MOSBzowmLnVEOuTN8/7npXyjsEAuubhOViTU=
+github.com/bnb-chain/gnfd-cosmos-sdk v0.0.2-0.20230210033000-9e761ce1485e/go.mod h1:NlIOmju3uhTOJ2YAzLPidpmh7sAgJ+J9dkUlSysHmjw=
 github.com/bnb-chain/gnfd-tendermint v0.0.1 h1:KWFuxWv8m6t1vUi3ADyVcEG0qVnEzQt1tjA6dk/b7+Q=
 github.com/bnb-chain/gnfd-tendermint v0.0.1/go.mod h1:/v9z9F6cq0+f7EGG92lYSLBcPYQDILoK91X8YM28hWo=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=

diff --git a/scripts/format.sh b/scripts/format.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+which goimportssort || go install github.com/AanZee/goimportssort
+
+for entry in `find . -name "*.go" | grep -v '.pb.'`; do
+    echo $entry
+    if grep -q "DO NOT EDIT" "$entry"; then
+      continue
+    fi
+    goimportssort -w -local github.com/bnb-chain/ $entry
+done
diff --git a/testutil/keeper/payment.go b/testutil/keeper/payment.go
@@ -1,28 +1,29 @@
 package keeper
 
 import (
-	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/cosmos/cosmos-sdk/x/authz"
-	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
-	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
 	"math/rand"
 	"testing"
 
-	"github.com/bnb-chain/greenfield/x/payment/keeper"
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/store"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	"github.com/cosmos/cosmos-sdk/x/authz"
+	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	typesparams "github.com/cosmos/cosmos-sdk/x/params/types"
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/libs/log"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	tmdb "github.com/tendermint/tm-db"
+
+	"github.com/bnb-chain/greenfield/x/payment/keeper"
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 func PaymentKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {

diff --git a/x/payment/client/cli/query.go b/x/payment/client/cli/query.go
@@ -2,13 +2,9 @@ package cli
 
 import (
 	"fmt"
-	// "strings"
-
-	"github.com/spf13/cobra"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	// "github.com/cosmos/cosmos-sdk/client/flags"
-	// sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/spf13/cobra"
 
 	"github.com/bnb-chain/greenfield/x/payment/types"
 )

diff --git a/x/payment/client/cli/query_auto_settle_record.go b/x/payment/client/cli/query_auto_settle_record.go
@@ -3,11 +3,12 @@ package cli
 import (
 	"context"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 func CmdListAutoSettleRecord() *cobra.Command {

diff --git a/x/payment/client/cli/query_bnb_price.go b/x/payment/client/cli/query_bnb_price.go
@@ -3,11 +3,12 @@ package cli
 import (
 	"context"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 func CmdListBnbPrice() *cobra.Command {

diff --git a/x/payment/client/cli/query_dynamic_balance.go b/x/payment/client/cli/query_dynamic_balance.go
@@ -3,10 +3,11 @@ package cli
 import (
 	"strconv"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 var _ = strconv.Itoa(0)

diff --git a/x/payment/client/cli/query_get_payment_accounts_by_owner.go b/x/payment/client/cli/query_get_payment_accounts_by_owner.go
@@ -3,10 +3,11 @@ package cli
 import (
 	"strconv"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 var _ = strconv.Itoa(0)

diff --git a/x/payment/client/cli/query_mock_bucket_meta.go b/x/payment/client/cli/query_mock_bucket_meta.go
@@ -3,10 +3,11 @@ package cli
 import (
 	"context"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 func CmdListMockBucketMeta() *cobra.Command {

diff --git a/x/payment/client/cli/query_mock_object_info.go b/x/payment/client/cli/query_mock_object_info.go
@@ -3,10 +3,11 @@ package cli
 import (
 	"context"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 func CmdListMockObjectInfo() *cobra.Command {

diff --git a/x/payment/client/cli/query_params.go b/x/payment/client/cli/query_params.go
@@ -3,10 +3,11 @@ package cli
 import (
 	"context"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 func CmdQueryParams() *cobra.Command {

diff --git a/x/payment/client/cli/query_payment_account.go b/x/payment/client/cli/query_payment_account.go
@@ -3,10 +3,11 @@ package cli
 import (
 	"context"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 func CmdListPaymentAccount() *cobra.Command {

diff --git a/x/payment/client/cli/query_payment_account_count.go b/x/payment/client/cli/query_payment_account_count.go
@@ -3,10 +3,11 @@ package cli
 import (
 	"context"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 func CmdListPaymentAccountCount() *cobra.Command {

diff --git a/x/payment/client/cli/query_stream_record.go b/x/payment/client/cli/query_stream_record.go
@@ -3,10 +3,11 @@ package cli
 import (
 	"context"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 func CmdListStreamRecord() *cobra.Command {

diff --git a/x/payment/client/cli/tx.go b/x/payment/client/cli/tx.go
@@ -4,10 +4,9 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/spf13/cobra"
 
-	"github.com/cosmos/cosmos-sdk/client"
-	// "github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 

diff --git a/x/payment/client/cli/tx_create_payment_account.go b/x/payment/client/cli/tx_create_payment_account.go
@@ -3,11 +3,12 @@ package cli
 import (
 	"strconv"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 var _ = strconv.Itoa(0)

diff --git a/x/payment/client/cli/tx_deposit.go b/x/payment/client/cli/tx_deposit.go
@@ -1,15 +1,16 @@
 package cli
 
 import (
-	sdkmath "cosmossdk.io/math"
 	"fmt"
 	"strconv"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
+	sdkmath "cosmossdk.io/math"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 var _ = strconv.Itoa(0)

diff --git a/x/payment/client/cli/tx_disable_refund.go b/x/payment/client/cli/tx_disable_refund.go
@@ -3,11 +3,12 @@ package cli
 import (
 	"strconv"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 var _ = strconv.Itoa(0)

diff --git a/x/payment/client/cli/tx_mock_create_bucket.go b/x/payment/client/cli/tx_mock_create_bucket.go
@@ -3,11 +3,12 @@ package cli
 import (
 	"strconv"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 var _ = strconv.Itoa(0)

diff --git a/x/payment/client/cli/tx_mock_delete_object.go b/x/payment/client/cli/tx_mock_delete_object.go
@@ -3,11 +3,12 @@ package cli
 import (
 	"strconv"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 var _ = strconv.Itoa(0)

diff --git a/x/payment/client/cli/tx_mock_put_object.go b/x/payment/client/cli/tx_mock_put_object.go
@@ -3,12 +3,13 @@ package cli
 import (
 	"strconv"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 var _ = strconv.Itoa(0)

diff --git a/x/payment/client/cli/tx_mock_seal_object.go b/x/payment/client/cli/tx_mock_seal_object.go
@@ -2,13 +2,14 @@ package cli
 
 import (
 	"strconv"
+	"strings"
 
-	"github.com/bnb-chain/greenfield/x/payment/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/spf13/cobra"
-	"strings"
+
+	"github.com/bnb-chain/greenfield/x/payment/types"
 )
 
 var _ = strconv.Itoa(0)