From 0224c053e86446392fd0e4c9ce45f6d32ec5a2a7 Mon Sep 17 00:00:00 2001 From: gluax <16431709+gluax@users.noreply.github.com> Date: Tue, 23 Jan 2024 14:13:56 -0800 Subject: [PATCH] fix: typo and formatting --- app/app.go | 29 +++++++++++------------ app/export.go | 3 ++- app/keepers/keepers.go | 13 +++++----- app/modules.go | 1 + app/params/config.go | 2 +- app/simulation_test.go | 6 ++--- app/upgrades/testnet/v1/constants.go | 2 ++ app/upgrades/types.go | 1 + app/utils/vrf_key.go | 4 ++-- cmd/seda-chaind/cmd/init.go | 4 +--- cmd/seda-chaind/cmd/root.go | 15 ++++++------ cmd/seda-chaind/gentx/collect_gentxs.go | 2 +- cmd/seda-chaind/gentx/gentx.go | 3 +-- cmd/seda-chaind/main.go | 1 + e2e/e2e_register_proxy_contract_test.go | 2 +- e2e/e2e_setup_test.go | 4 ++-- e2e/e2e_wasm_storage_test.go | 1 + e2e/validator.go | 3 ++- interchaintest/chain_start_test.go | 3 ++- interchaintest/chain_upgrade_test.go | 5 ++-- interchaintest/conformance/cosmwasm.go | 5 ++-- interchaintest/helpers/cosmwasm.go | 3 +-- interchaintest/setup.go | 10 ++++---- proto/sedachain/randomness/v1/query.proto | 2 +- testutil/network/network.go | 2 +- tools/tools.go | 3 ++- x/randomness/keeper/keeper.go | 1 + x/randomness/keeper/query_plugin.go | 1 + x/randomness/types/genesis.pb.go | 3 ++- x/randomness/types/query.pb.go | 12 ++++++---- x/randomness/types/randomness.pb.go | 7 +++--- x/randomness/types/tx.pb.go | 14 ++++++----- x/staking/client/cli/tx.go | 5 ++-- x/staking/keeper/msg_server.go | 1 + x/staking/module.go | 3 ++- x/staking/types/tx.pb.go | 16 +++++++------ x/wasm-storage/keeper/common_test.go | 2 +- x/wasm-storage/keeper/keeper.go | 1 + x/wasm-storage/types/events.pb.go | 3 ++- x/wasm-storage/types/genesis.pb.go | 5 ++-- x/wasm-storage/types/query.pb.go | 12 ++++++---- x/wasm-storage/types/tx.pb.go | 14 ++++++----- x/wasm-storage/types/wasm_storage.pb.go | 10 ++++---- 43 files changed, 134 insertions(+), 105 deletions(-) diff --git a/app/app.go b/app/app.go index 45cf718c..33988dae 100644 --- a/app/app.go +++ b/app/app.go @@ -8,8 +8,6 @@ import ( "os" "path/filepath" - "github.com/spf13/cast" - autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1" "cosmossdk.io/client/v2/autocli" @@ -30,12 +28,15 @@ import ( "cosmossdk.io/x/upgrade" upgradekeeper "cosmossdk.io/x/upgrade/keeper" upgradetypes "cosmossdk.io/x/upgrade/types" + "github.com/spf13/cast" + + abci "github.com/cometbft/cometbft/abci/types" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + wasmapp "github.com/CosmWasm/wasmd/app" wasm "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - abci "github.com/cometbft/cometbft/abci/types" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" @@ -102,7 +103,15 @@ import ( "github.com/cosmos/ibc-go/modules/capability" capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" - + // ica + ica "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts" + icacontroller "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller" + icacontrollerkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/keeper" + icacontrollertypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/types" + icahost "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host" + icahostkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/keeper" + icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types" + icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types" // ibc ibcfee "github.com/cosmos/ibc-go/v8/modules/apps/29-fee" ibcfeekeeper "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/keeper" @@ -116,16 +125,6 @@ import ( ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint" - // ica - ica "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts" - icacontroller "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller" - icacontrollerkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/keeper" - icacontrollertypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/types" - icahost "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host" - icahostkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/keeper" - icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types" - icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types" - "github.com/sedaprotocol/seda-chain/app/keepers" appparams "github.com/sedaprotocol/seda-chain/app/params" "github.com/sedaprotocol/seda-chain/docs" diff --git a/app/export.go b/app/export.go index 63528866..4b65cafb 100644 --- a/app/export.go +++ b/app/export.go @@ -5,9 +5,10 @@ import ( "fmt" "log" + storetypes "cosmossdk.io/store/types" + cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - storetypes "cosmossdk.io/store/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/keepers/keepers.go b/app/keepers/keepers.go index e2caa48a..6a8bbe73 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -5,6 +5,9 @@ import ( evidencekeeper "cosmossdk.io/x/evidence/keeper" feegrantkeeper "cosmossdk.io/x/feegrant/keeper" upgradekeeper "cosmossdk.io/x/upgrade/keeper" + + // ibc + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" @@ -17,16 +20,12 @@ import ( slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" - ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" - - // ibc - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - ibcfeekeeper "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/keeper" - ibctransferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper" - // ica icacontrollerkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/keeper" icahostkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/keeper" + ibcfeekeeper "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/keeper" + ibctransferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper" + ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" ) type AppKeepers struct { diff --git a/app/modules.go b/app/modules.go index efd4d561..b914c4bb 100644 --- a/app/modules.go +++ b/app/modules.go @@ -4,6 +4,7 @@ import ( "encoding/json" "cosmossdk.io/math" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/x/distribution" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" diff --git a/app/params/config.go b/app/params/config.go index 46219155..c393b7ae 100644 --- a/app/params/config.go +++ b/app/params/config.go @@ -2,8 +2,8 @@ package params import ( errorsmod "cosmossdk.io/errors" - "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/app/simulation_test.go b/app/simulation_test.go index 74917174..0e62c71c 100644 --- a/app/simulation_test.go +++ b/app/simulation_test.go @@ -10,13 +10,13 @@ import ( "testing" "time" + "cosmossdk.io/log" + storetypes "cosmossdk.io/store/types" + evidencetypes "cosmossdk.io/x/evidence/types" "github.com/stretchr/testify/require" - "cosmossdk.io/log" abci "github.com/cometbft/cometbft/abci/types" - storetypes "cosmossdk.io/store/types" - evidencetypes "cosmossdk.io/x/evidence/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/app/upgrades/testnet/v1/constants.go b/app/upgrades/testnet/v1/constants.go index 553228dd..b2cdda5e 100644 --- a/app/upgrades/testnet/v1/constants.go +++ b/app/upgrades/testnet/v1/constants.go @@ -5,7 +5,9 @@ import ( storetypes "cosmossdk.io/store/types" upgradetypes "cosmossdk.io/x/upgrade/types" + "github.com/cosmos/cosmos-sdk/types/module" + "github.com/sedaprotocol/seda-chain/app/keepers" "github.com/sedaprotocol/seda-chain/app/upgrades" ) diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 02e348b4..a4021e53 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -7,6 +7,7 @@ import ( upgradetypes "cosmossdk.io/x/upgrade/types" "github.com/cosmos/cosmos-sdk/types/module" + "github.com/sedaprotocol/seda-chain/app/keepers" ) diff --git a/app/utils/vrf_key.go b/app/utils/vrf_key.go index ac3318dc..2bcc49cb 100644 --- a/app/utils/vrf_key.go +++ b/app/utils/vrf_key.go @@ -6,6 +6,8 @@ import ( "os" "path/filepath" + vrf "github.com/sedaprotocol/vrf-go" + cfg "github.com/cometbft/cometbft/config" "github.com/cometbft/cometbft/crypto" "github.com/cometbft/cometbft/crypto/secp256k1" @@ -20,8 +22,6 @@ import ( "github.com/cosmos/cosmos-sdk/types/tx/signing" txsigning "github.com/cosmos/cosmos-sdk/types/tx/signing" authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" - - vrf "github.com/sedaprotocol/vrf-go" ) const VRFKeyFileName = "vrf_key.json" diff --git a/cmd/seda-chaind/cmd/init.go b/cmd/seda-chaind/cmd/init.go index 97623205..ea032a00 100644 --- a/cmd/seda-chaind/cmd/init.go +++ b/cmd/seda-chaind/cmd/init.go @@ -7,7 +7,6 @@ import ( "path/filepath" "strings" - "github.com/cosmos/go-bip39" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -15,10 +14,9 @@ import ( cmtos "github.com/cometbft/cometbft/libs/os" "github.com/cometbft/cometbft/privval" - // "github.com/cometbft/cometbft/types" - "github.com/cosmos/cosmos-sdk/client/input" "github.com/cosmos/cosmos-sdk/x/genutil/types" + "github.com/cosmos/go-bip39" "github.com/sedaprotocol/seda-chain/cmd/seda-chaind/utils" ) diff --git a/cmd/seda-chaind/cmd/root.go b/cmd/seda-chaind/cmd/root.go index ce7c95ee..73fdafa2 100644 --- a/cmd/seda-chaind/cmd/root.go +++ b/cmd/seda-chaind/cmd/root.go @@ -6,12 +6,6 @@ import ( "os" "path/filepath" - "github.com/spf13/cast" - "github.com/spf13/cobra" - "github.com/spf13/pflag" - "google.golang.org/grpc" - "google.golang.org/protobuf/reflect/protoregistry" - "cosmossdk.io/client/v2/autocli" "cosmossdk.io/client/v2/autocli/flag" "cosmossdk.io/log" @@ -20,8 +14,15 @@ import ( snapshottypes "cosmossdk.io/store/snapshots/types" storetypes "cosmossdk.io/store/types" confixcmd "cosmossdk.io/tools/confix/cmd" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/spf13/cast" + "github.com/spf13/cobra" + "github.com/spf13/pflag" + "google.golang.org/grpc" + "google.golang.org/protobuf/reflect/protoregistry" + tmcli "github.com/cometbft/cometbft/libs/cli" + + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" diff --git a/cmd/seda-chaind/gentx/collect_gentxs.go b/cmd/seda-chaind/gentx/collect_gentxs.go index f2ee4ba8..0b407116 100644 --- a/cmd/seda-chaind/gentx/collect_gentxs.go +++ b/cmd/seda-chaind/gentx/collect_gentxs.go @@ -9,11 +9,11 @@ import ( "sort" "strings" + "cosmossdk.io/errors" "github.com/spf13/cobra" cfg "github.com/cometbft/cometbft/config" - "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/codec" diff --git a/cmd/seda-chaind/gentx/gentx.go b/cmd/seda-chaind/gentx/gentx.go index 5555de05..fdb81e83 100644 --- a/cmd/seda-chaind/gentx/gentx.go +++ b/cmd/seda-chaind/gentx/gentx.go @@ -9,10 +9,9 @@ import ( "os" "path/filepath" - "github.com/spf13/cobra" - address "cosmossdk.io/core/address" "cosmossdk.io/errors" + "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/cmd/seda-chaind/main.go b/cmd/seda-chaind/main.go index 2cce1bb1..7e12b31c 100644 --- a/cmd/seda-chaind/main.go +++ b/cmd/seda-chaind/main.go @@ -4,6 +4,7 @@ import ( "os" "cosmossdk.io/log" + svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" "github.com/sedaprotocol/seda-chain/app" diff --git a/e2e/e2e_register_proxy_contract_test.go b/e2e/e2e_register_proxy_contract_test.go index ac394ea5..ec261738 100644 --- a/e2e/e2e_register_proxy_contract_test.go +++ b/e2e/e2e_register_proxy_contract_test.go @@ -7,11 +7,11 @@ import ( "path/filepath" "time" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdktypes "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/sedaprotocol/seda-chain/x/wasm-storage/types" ) diff --git a/e2e/e2e_setup_test.go b/e2e/e2e_setup_test.go index 5454b87d..e49cdb9e 100644 --- a/e2e/e2e_setup_test.go +++ b/e2e/e2e_setup_test.go @@ -12,6 +12,8 @@ import ( "testing" "time" + "cosmossdk.io/math" + evidencetypes "cosmossdk.io/x/evidence/types" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" "github.com/spf13/viper" @@ -20,8 +22,6 @@ import ( tmconfig "github.com/cometbft/cometbft/config" rpchttp "github.com/cometbft/cometbft/rpc/client/http" - "cosmossdk.io/math" - evidencetypes "cosmossdk.io/x/evidence/types" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" "github.com/cosmos/cosmos-sdk/server" diff --git a/e2e/e2e_wasm_storage_test.go b/e2e/e2e_wasm_storage_test.go index 54433cbe..57ad6666 100644 --- a/e2e/e2e_wasm_storage_test.go +++ b/e2e/e2e_wasm_storage_test.go @@ -10,6 +10,7 @@ import ( "time" "github.com/ethereum/go-ethereum/crypto" + "github.com/sedaprotocol/seda-chain/x/wasm-storage/types" ) diff --git a/e2e/validator.go b/e2e/validator.go index 683f6482..0905dc8b 100644 --- a/e2e/validator.go +++ b/e2e/validator.go @@ -8,13 +8,14 @@ import ( "path" "path/filepath" + "cosmossdk.io/math" + tmcfg "github.com/cometbft/cometbft/config" "github.com/cometbft/cometbft/crypto/ed25519" tmos "github.com/cometbft/cometbft/libs/os" "github.com/cometbft/cometbft/p2p" "github.com/cometbft/cometbft/privval" - "cosmossdk.io/math" sdkcrypto "github.com/cosmos/cosmos-sdk/crypto" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/hd" diff --git a/interchaintest/chain_start_test.go b/interchaintest/chain_start_test.go index 02ebe12b..82be6182 100644 --- a/interchaintest/chain_start_test.go +++ b/interchaintest/chain_start_test.go @@ -3,10 +3,11 @@ package interchaintest import ( "testing" - "github.com/sedaprotocol/seda-chain/interchaintest/conformance" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" "github.com/stretchr/testify/require" + + "github.com/sedaprotocol/seda-chain/interchaintest/conformance" ) func TestChainStart(t *testing.T) { diff --git a/interchaintest/chain_upgrade_test.go b/interchaintest/chain_upgrade_test.go index 7b74e860..2982940e 100644 --- a/interchaintest/chain_upgrade_test.go +++ b/interchaintest/chain_upgrade_test.go @@ -6,16 +6,17 @@ import ( "testing" "time" + upgradetypes "cosmossdk.io/x/upgrade/types" "github.com/docker/docker/client" - "github.com/sedaprotocol/seda-chain/interchaintest/conformance" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v8/ibc" "github.com/strangelove-ventures/interchaintest/v8/testutil" "github.com/stretchr/testify/require" - upgradetypes "cosmossdk.io/x/upgrade/types" cosmosproto "github.com/cosmos/gogoproto/proto" + + "github.com/sedaprotocol/seda-chain/interchaintest/conformance" ) const ( diff --git a/interchaintest/conformance/cosmwasm.go b/interchaintest/conformance/cosmwasm.go index a3bd9699..be6caa7a 100644 --- a/interchaintest/conformance/cosmwasm.go +++ b/interchaintest/conformance/cosmwasm.go @@ -4,11 +4,12 @@ import ( "context" "testing" - "github.com/sedaprotocol/seda-chain/interchaintest/helpers" - "github.com/sedaprotocol/seda-chain/interchaintest/types" "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v8/ibc" "github.com/stretchr/testify/require" + + "github.com/sedaprotocol/seda-chain/interchaintest/helpers" + "github.com/sedaprotocol/seda-chain/interchaintest/types" ) // ConformanceCosmWasm validates that store, instantiate, execute, and query work on a CosmWasm contract. diff --git a/interchaintest/helpers/cosmwasm.go b/interchaintest/helpers/cosmwasm.go index 5d3dc224..6adc09f5 100644 --- a/interchaintest/helpers/cosmwasm.go +++ b/interchaintest/helpers/cosmwasm.go @@ -10,9 +10,8 @@ import ( "github.com/strangelove-ventures/interchaintest/v8/testutil" "github.com/stretchr/testify/require" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/crypto/keyring" + sdk "github.com/cosmos/cosmos-sdk/types" ) func SmartQueryString(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, contractAddr, queryMsg string, res interface{}) error { diff --git a/interchaintest/setup.go b/interchaintest/setup.go index 145100d1..8e1f9e60 100644 --- a/interchaintest/setup.go +++ b/interchaintest/setup.go @@ -5,17 +5,19 @@ import ( "fmt" "testing" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/cosmos/cosmos-sdk/types/module/testutil" - ibclocalhost "github.com/cosmos/ibc-go/v8/modules/light-clients/09-localhost" "github.com/docker/docker/client" - "github.com/sedaprotocol/seda-chain/interchaintest/types" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v8/ibc" "github.com/strangelove-ventures/interchaintest/v8/testreporter" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" + + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/cosmos/cosmos-sdk/types/module/testutil" + ibclocalhost "github.com/cosmos/ibc-go/v8/modules/light-clients/09-localhost" + + "github.com/sedaprotocol/seda-chain/interchaintest/types" ) var ( diff --git a/proto/sedachain/randomness/v1/query.proto b/proto/sedachain/randomness/v1/query.proto index 93ca131a..aa04912e 100644 --- a/proto/sedachain/randomness/v1/query.proto +++ b/proto/sedachain/randomness/v1/query.proto @@ -5,7 +5,7 @@ import "google/api/annotations.proto"; option go_package = "github.com/sedaprotocol/seda-chain/x/randomness/types"; -// Query Serivce is the definition for the random modules gRPC query methods. +// Query Service is the definition for the random modules gRPC query methods. service Query { // For getting the random modules seed. rpc Seed(QuerySeedRequest) returns (QuerySeedResponse) { diff --git a/testutil/network/network.go b/testutil/network/network.go index 65fb0dd9..962727f8 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -5,11 +5,11 @@ import ( "testing" "time" + pruningtypes "cosmossdk.io/store/pruning/types" "github.com/stretchr/testify/require" tmrand "github.com/cometbft/cometbft/libs/rand" - pruningtypes "cosmossdk.io/store/pruning/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" diff --git a/tools/tools.go b/tools/tools.go index 6e7a12d4..3a876c1d 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -3,9 +3,10 @@ package tools import ( - _ "github.com/cosmos/gogoproto/protoc-gen-gocosmos" _ "github.com/golang/protobuf/protoc-gen-go" _ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway" _ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2" + + _ "github.com/cosmos/gogoproto/protoc-gen-gocosmos" ) diff --git a/x/randomness/keeper/keeper.go b/x/randomness/keeper/keeper.go index 05e22c4d..992a98c7 100644 --- a/x/randomness/keeper/keeper.go +++ b/x/randomness/keeper/keeper.go @@ -6,6 +6,7 @@ import ( "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" + "github.com/cosmos/cosmos-sdk/codec" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/randomness/keeper/query_plugin.go b/x/randomness/keeper/query_plugin.go index abce77cf..8e0a0aec 100644 --- a/x/randomness/keeper/query_plugin.go +++ b/x/randomness/keeper/query_plugin.go @@ -4,6 +4,7 @@ import ( "encoding/json" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/sedaprotocol/seda-chain/x/randomness/types" ) diff --git a/x/randomness/types/genesis.pb.go b/x/randomness/types/genesis.pb.go index 771b1634..5dc966bc 100644 --- a/x/randomness/types/genesis.pb.go +++ b/x/randomness/types/genesis.pb.go @@ -5,10 +5,11 @@ package types import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/randomness/types/query.pb.go b/x/randomness/types/query.pb.go index fa84417e..8340e328 100644 --- a/x/randomness/types/query.pb.go +++ b/x/randomness/types/query.pb.go @@ -6,15 +6,17 @@ package types import ( context "context" fmt "fmt" - grpc1 "github.com/cosmos/gogoproto/grpc" - proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" + _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" + + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/randomness/types/randomness.pb.go b/x/randomness/types/randomness.pb.go index e040a599..981f8595 100644 --- a/x/randomness/types/randomness.pb.go +++ b/x/randomness/types/randomness.pb.go @@ -5,12 +5,13 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/cosmos-proto" + types "github.com/cosmos/cosmos-sdk/codec/types" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/randomness/types/tx.pb.go b/x/randomness/types/tx.pb.go index d711ef9d..b25c4421 100644 --- a/x/randomness/types/tx.pb.go +++ b/x/randomness/types/tx.pb.go @@ -6,15 +6,17 @@ package types import ( context "context" fmt "fmt" - _ "github.com/cosmos/cosmos-sdk/types/msgservice" - grpc1 "github.com/cosmos/gogoproto/grpc" - proto "github.com/cosmos/gogoproto/proto" - grpc "google.golang.org/grpc" - codes "google.golang.org/grpc/codes" - status "google.golang.org/grpc/status" io "io" math "math" math_bits "math/bits" + + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + + _ "github.com/cosmos/cosmos-sdk/types/msgservice" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/staking/client/cli/tx.go b/x/staking/client/cli/tx.go index 91b4e1ce..f884587a 100644 --- a/x/staking/client/cli/tx.go +++ b/x/staking/client/cli/tx.go @@ -4,13 +4,12 @@ import ( "fmt" "strings" - "github.com/spf13/cobra" - flag "github.com/spf13/pflag" - "cosmossdk.io/core/address" "cosmossdk.io/errors" errorsmod "cosmossdk.io/errors" "cosmossdk.io/math" + "github.com/spf13/cobra" + flag "github.com/spf13/pflag" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/staking/keeper/msg_server.go b/x/staking/keeper/msg_server.go index f7ad3943..f00cfe1d 100644 --- a/x/staking/keeper/msg_server.go +++ b/x/staking/keeper/msg_server.go @@ -5,6 +5,7 @@ import ( addresscodec "cosmossdk.io/core/address" errorsmod "cosmossdk.io/errors" + cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/staking/module.go b/x/staking/module.go index c245010c..18248c5e 100644 --- a/x/staking/module.go +++ b/x/staking/module.go @@ -5,10 +5,11 @@ import ( "encoding/json" "fmt" - abci "github.com/cometbft/cometbft/abci/types" gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/staking/types/tx.pb.go b/x/staking/types/tx.pb.go index c8d263c6..1e07cff2 100644 --- a/x/staking/types/tx.pb.go +++ b/x/staking/types/tx.pb.go @@ -5,8 +5,16 @@ package types import ( context "context" - cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + + cosmossdk_io_math "cosmossdk.io/math" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + _ "github.com/cosmos/cosmos-proto" types1 "github.com/cosmos/cosmos-sdk/codec/types" types2 "github.com/cosmos/cosmos-sdk/types" @@ -16,12 +24,6 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - grpc "google.golang.org/grpc" - codes "google.golang.org/grpc/codes" - status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/wasm-storage/keeper/common_test.go b/x/wasm-storage/keeper/common_test.go index d5fe5def..56eeec0d 100644 --- a/x/wasm-storage/keeper/common_test.go +++ b/x/wasm-storage/keeper/common_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" + storetypes "cosmossdk.io/store/types" "github.com/stretchr/testify/suite" - storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/testutil" diff --git a/x/wasm-storage/keeper/keeper.go b/x/wasm-storage/keeper/keeper.go index 05be5dcd..7d98f46f 100644 --- a/x/wasm-storage/keeper/keeper.go +++ b/x/wasm-storage/keeper/keeper.go @@ -6,6 +6,7 @@ import ( "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/wasm-storage/types/events.pb.go b/x/wasm-storage/types/events.pb.go index 928c6f2b..150ac8cc 100644 --- a/x/wasm-storage/types/events.pb.go +++ b/x/wasm-storage/types/events.pb.go @@ -5,10 +5,11 @@ package types import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/wasm-storage/types/genesis.pb.go b/x/wasm-storage/types/genesis.pb.go index 4fca28dc..abb21c89 100644 --- a/x/wasm-storage/types/genesis.pb.go +++ b/x/wasm-storage/types/genesis.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/wasm-storage/types/query.pb.go b/x/wasm-storage/types/query.pb.go index 01a1ba6c..9ff0ecd4 100644 --- a/x/wasm-storage/types/query.pb.go +++ b/x/wasm-storage/types/query.pb.go @@ -6,15 +6,17 @@ package types import ( context "context" fmt "fmt" - grpc1 "github.com/cosmos/gogoproto/grpc" - proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" + _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" + + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/wasm-storage/types/tx.pb.go b/x/wasm-storage/types/tx.pb.go index bbd4b320..c8f16e46 100644 --- a/x/wasm-storage/types/tx.pb.go +++ b/x/wasm-storage/types/tx.pb.go @@ -6,6 +6,14 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + github_com_CosmWasm_wasmd_x_wasm_types "github.com/CosmWasm/wasmd/x/wasm/types" _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" @@ -14,12 +22,6 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - grpc "google.golang.org/grpc" - codes "google.golang.org/grpc/codes" - status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/wasm-storage/types/wasm_storage.pb.go b/x/wasm-storage/types/wasm_storage.pb.go index 008d4015..edf67c90 100644 --- a/x/wasm-storage/types/wasm_storage.pb.go +++ b/x/wasm-storage/types/wasm_storage.pb.go @@ -5,14 +5,16 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" math_bits "math/bits" time "time" + + _ "google.golang.org/protobuf/types/known/timestamppb" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" ) // Reference imports to suppress errors if they are not otherwise used.