Skip to content

Commit

Permalink
chore: use github.com/zeta-chain/node import path (#2796)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gartnera
gartnera authored Aug 30, 2024
1 parent 046344a commit b516a46
Show file tree
Hide file tree
Showing 1,080 changed files with 4,667 additions and 4,634 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ linters-settings:
sections:
- standard
- default
- prefix(github.com/zeta-chain/zetacore)
- prefix(github.com/zeta-chain/node)
skip-generated: true

issues:
Expand Down
8 changes: 4 additions & 4 deletions .goreleaser.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ builds:
- -X github.com/cosmos/cosmos-sdk/version.ClientName=zetaclientd
- -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }}
- -X github.com/cosmos/cosmos-sdk/version.Commit={{ .FullCommit }}
- -X github.com/zeta-chain/zetacore/pkg/constant.Name=zetacored
- -X github.com/zeta-chain/zetacore/pkg/constant.Version={{ .Version }}
- -X github.com/zeta-chain/zetacore/pkg/constant.CommitHash={{ .FullCommit }}
- -X github.com/zeta-chain/zetacore/pkg/constant.BuildTime={{ .Env.BUILDTIME }}
- -X github.com/zeta-chain/node/pkg/constant.Name=zetacored
- -X github.com/zeta-chain/node/pkg/constant.Version={{ .Version }}
- -X github.com/zeta-chain/node/pkg/constant.CommitHash={{ .FullCommit }}
- -X github.com/zeta-chain/node/pkg/constant.BuildTime={{ .Env.BUILDTIME }}
- -X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb

- id: "zetaclientd"
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=zetacore \
-X github.com/cosmos/cosmos-sdk/version.ClientName=zetaclientd \
-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-X github.com/zeta-chain/zetacore/pkg/constant.Name=zetacored \
-X github.com/zeta-chain/zetacore/pkg/constant.Version=$(VERSION) \
-X github.com/zeta-chain/zetacore/pkg/constant.CommitHash=$(COMMIT) \
-X github.com/zeta-chain/zetacore/pkg/constant.BuildTime=$(BUILDTIME) \
-X github.com/zeta-chain/node/pkg/constant.Name=zetacored \
-X github.com/zeta-chain/node/pkg/constant.Version=$(VERSION) \
-X github.com/zeta-chain/node/pkg/constant.CommitHash=$(COMMIT) \
-X github.com/zeta-chain/node/pkg/constant.BuildTime=$(BUILDTIME) \
-X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb

BUILD_FLAGS := -ldflags '$(ldflags)' -tags pebbledb,ledger
Expand Down
4 changes: 2 additions & 2 deletions app/ante/ante.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/authz"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
observertypes "github.com/zeta-chain/zetacore/x/observer/types"
crosschaintypes "github.com/zeta-chain/node/x/crosschain/types"
observertypes "github.com/zeta-chain/node/x/observer/types"
)

func ValidateHandlerOptions(options HandlerOptions) error {
Expand Down
10 changes: 5 additions & 5 deletions app/ante/ante_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
"github.com/stretchr/testify/require"

"github.com/zeta-chain/zetacore/app"
"github.com/zeta-chain/zetacore/app/ante"
"github.com/zeta-chain/zetacore/testutil/sample"
crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
observertypes "github.com/zeta-chain/zetacore/x/observer/types"
"github.com/zeta-chain/node/app"
"github.com/zeta-chain/node/app/ante"
"github.com/zeta-chain/node/testutil/sample"
crosschaintypes "github.com/zeta-chain/node/x/crosschain/types"
observertypes "github.com/zeta-chain/node/x/observer/types"
)

var _ sdk.AnteHandler = (&MockAnteHandler{}).AnteHandle
Expand Down
2 changes: 1 addition & 1 deletion app/ante/handler_options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
ethermint "github.com/zeta-chain/ethermint/types"
evmtypes "github.com/zeta-chain/ethermint/x/evm/types"

observerkeeper "github.com/zeta-chain/zetacore/x/observer/keeper"
observerkeeper "github.com/zeta-chain/node/x/observer/keeper"
)

type HandlerOptions struct {
Expand Down
6 changes: 3 additions & 3 deletions app/ante/system_tx_priority_decorator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/require"

"github.com/zeta-chain/zetacore/app"
"github.com/zeta-chain/zetacore/app/ante"
"github.com/zeta-chain/zetacore/testutil/sample"
"github.com/zeta-chain/node/app"
"github.com/zeta-chain/node/app/ante"
"github.com/zeta-chain/node/testutil/sample"
)

func TestSystemTxPriorityDecorator_AnteHandle(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions app/ante/vesting_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/stretchr/testify/require"

"github.com/zeta-chain/zetacore/app"
"github.com/zeta-chain/zetacore/app/ante"
"github.com/zeta-chain/zetacore/testutil/sample"
"github.com/zeta-chain/node/app"
"github.com/zeta-chain/node/app/ante"
"github.com/zeta-chain/node/testutil/sample"
)

func TestVesting_AnteHandle(t *testing.T) {
Expand Down
52 changes: 26 additions & 26 deletions app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,29 +89,29 @@ import (
feemarketkeeper "github.com/zeta-chain/ethermint/x/feemarket/keeper"
feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types"

"github.com/zeta-chain/zetacore/app/ante"
"github.com/zeta-chain/zetacore/docs/openapi"
zetamempool "github.com/zeta-chain/zetacore/pkg/mempool"
"github.com/zeta-chain/zetacore/precompiles"
srvflags "github.com/zeta-chain/zetacore/server/flags"
authoritymodule "github.com/zeta-chain/zetacore/x/authority"
authoritykeeper "github.com/zeta-chain/zetacore/x/authority/keeper"
authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
crosschainmodule "github.com/zeta-chain/zetacore/x/crosschain"
crosschainkeeper "github.com/zeta-chain/zetacore/x/crosschain/keeper"
crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
emissionsmodule "github.com/zeta-chain/zetacore/x/emissions"
emissionskeeper "github.com/zeta-chain/zetacore/x/emissions/keeper"
emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types"
fungiblemodule "github.com/zeta-chain/zetacore/x/fungible"
fungiblekeeper "github.com/zeta-chain/zetacore/x/fungible/keeper"
fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types"
lightclientmodule "github.com/zeta-chain/zetacore/x/lightclient"
lightclientkeeper "github.com/zeta-chain/zetacore/x/lightclient/keeper"
lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types"
observermodule "github.com/zeta-chain/zetacore/x/observer"
observerkeeper "github.com/zeta-chain/zetacore/x/observer/keeper"
observertypes "github.com/zeta-chain/zetacore/x/observer/types"
"github.com/zeta-chain/node/app/ante"
"github.com/zeta-chain/node/docs/openapi"
zetamempool "github.com/zeta-chain/node/pkg/mempool"
"github.com/zeta-chain/node/precompiles"
srvflags "github.com/zeta-chain/node/server/flags"
authoritymodule "github.com/zeta-chain/node/x/authority"
authoritykeeper "github.com/zeta-chain/node/x/authority/keeper"
authoritytypes "github.com/zeta-chain/node/x/authority/types"
crosschainmodule "github.com/zeta-chain/node/x/crosschain"
crosschainkeeper "github.com/zeta-chain/node/x/crosschain/keeper"
crosschaintypes "github.com/zeta-chain/node/x/crosschain/types"
emissionsmodule "github.com/zeta-chain/node/x/emissions"
emissionskeeper "github.com/zeta-chain/node/x/emissions/keeper"
emissionstypes "github.com/zeta-chain/node/x/emissions/types"
fungiblemodule "github.com/zeta-chain/node/x/fungible"
fungiblekeeper "github.com/zeta-chain/node/x/fungible/keeper"
fungibletypes "github.com/zeta-chain/node/x/fungible/types"
lightclientmodule "github.com/zeta-chain/node/x/lightclient"
lightclientkeeper "github.com/zeta-chain/node/x/lightclient/keeper"
lightclienttypes "github.com/zeta-chain/node/x/lightclient/types"
observermodule "github.com/zeta-chain/node/x/observer"
observerkeeper "github.com/zeta-chain/node/x/observer/keeper"
observertypes "github.com/zeta-chain/node/x/observer/types"
)

// TODO: enable back IBC
Expand All @@ -128,9 +128,9 @@ import (
// ibctypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
// ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
// ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
// "github.com/zeta-chain/zetacore/x/ibccrosschain"
// ibccrosschainkeeper "github.com/zeta-chain/zetacore/x/ibccrosschain/keeper"
// ibccrosschaintypes "github.com/zeta-chain/zetacore/x/ibccrosschain/types"
// "github.com/zeta-chain/node/x/ibccrosschain"
// ibccrosschainkeeper "github.com/zeta-chain/node/x/ibccrosschain/keeper"
// ibccrosschaintypes "github.com/zeta-chain/node/x/ibccrosschain/types"

const Name = "zetacore"

Expand Down
12 changes: 6 additions & 6 deletions app/init_genesis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import (
evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types"

authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
emissionsModuleTypes "github.com/zeta-chain/zetacore/x/emissions/types"
fungibleModuleTypes "github.com/zeta-chain/zetacore/x/fungible/types"
lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types"
observertypes "github.com/zeta-chain/zetacore/x/observer/types"
authoritytypes "github.com/zeta-chain/node/x/authority/types"
crosschaintypes "github.com/zeta-chain/node/x/crosschain/types"
emissionsModuleTypes "github.com/zeta-chain/node/x/emissions/types"
fungibleModuleTypes "github.com/zeta-chain/node/x/fungible/types"
lightclienttypes "github.com/zeta-chain/node/x/lightclient/types"
observertypes "github.com/zeta-chain/node/x/observer/types"
)

// InitGenesisModuleList returns the module list for genesis initialization
Expand Down
2 changes: 1 addition & 1 deletion app/prefix.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
ethcfg "github.com/zeta-chain/ethermint/cmd/config"

cmdcfg "github.com/zeta-chain/zetacore/cmd/zetacored/config"
cmdcfg "github.com/zeta-chain/node/cmd/zetacored/config"
)

func SetConfig() {
Expand Down
8 changes: 4 additions & 4 deletions app/setup_handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"github.com/cosmos/cosmos-sdk/x/upgrade/types"
"golang.org/x/exp/slices"

"github.com/zeta-chain/zetacore/pkg/constant"
authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types"
observertypes "github.com/zeta-chain/zetacore/x/observer/types"
"github.com/zeta-chain/node/pkg/constant"
authoritytypes "github.com/zeta-chain/node/x/authority/types"
emissionstypes "github.com/zeta-chain/node/x/emissions/types"
observertypes "github.com/zeta-chain/node/x/observer/types"
)

func SetupHandlers(app *App) {
Expand Down
4 changes: 2 additions & 2 deletions app/upgrade_tracker_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/stretchr/testify/require"

authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types"
authoritytypes "github.com/zeta-chain/node/x/authority/types"
lightclienttypes "github.com/zeta-chain/node/x/lightclient/types"
)

func TestUpgradeTracker(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/zetaclientd-supervisor/lib.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/zeta-chain/zetacore/zetaclient/config"
"github.com/zeta-chain/node/zetaclient/config"
)

const zetaclientdBinaryName = "zetaclientd"
Expand Down
6 changes: 3 additions & 3 deletions cmd/zetaclientd-supervisor/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"cosmossdk.io/errors"
"golang.org/x/sync/errgroup"

"github.com/zeta-chain/zetacore/app"
zetaos "github.com/zeta-chain/zetacore/pkg/os"
"github.com/zeta-chain/zetacore/zetaclient/config"
"github.com/zeta-chain/node/app"
zetaos "github.com/zeta-chain/node/pkg/os"
"github.com/zeta-chain/node/zetaclient/config"
)

func main() {
Expand Down
16 changes: 8 additions & 8 deletions cmd/zetaclientd/debug.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ import (
"github.com/rs/zerolog"
"github.com/spf13/cobra"

"github.com/zeta-chain/zetacore/pkg/coin"
"github.com/zeta-chain/zetacore/testutil/sample"
btcobserver "github.com/zeta-chain/zetacore/zetaclient/chains/bitcoin/observer"
evmobserver "github.com/zeta-chain/zetacore/zetaclient/chains/evm/observer"
"github.com/zeta-chain/zetacore/zetaclient/config"
zctx "github.com/zeta-chain/zetacore/zetaclient/context"
"github.com/zeta-chain/zetacore/zetaclient/keys"
"github.com/zeta-chain/zetacore/zetaclient/zetacore"
"github.com/zeta-chain/node/pkg/coin"
"github.com/zeta-chain/node/testutil/sample"
btcobserver "github.com/zeta-chain/node/zetaclient/chains/bitcoin/observer"
evmobserver "github.com/zeta-chain/node/zetaclient/chains/evm/observer"
"github.com/zeta-chain/node/zetaclient/config"
zctx "github.com/zeta-chain/node/zetaclient/context"
"github.com/zeta-chain/node/zetaclient/keys"
"github.com/zeta-chain/node/zetaclient/zetacore"
)

var debugArgs = debugArguments{}
Expand Down
2 changes: 1 addition & 1 deletion cmd/zetaclientd/encrypt_tss.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

"github.com/zeta-chain/zetacore/pkg/crypto"
"github.com/zeta-chain/node/pkg/crypto"
)

var encTssCmd = &cobra.Command{
Expand Down
6 changes: 3 additions & 3 deletions cmd/zetaclientd/hsm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/spf13/cobra"
keystone "github.com/zeta-chain/keystone/keys"

"github.com/zeta-chain/zetacore/cmd"
"github.com/zeta-chain/zetacore/pkg/cosmos"
"github.com/zeta-chain/zetacore/zetaclient/hsm"
"github.com/zeta-chain/node/cmd"
"github.com/zeta-chain/node/pkg/cosmos"
"github.com/zeta-chain/node/zetaclient/hsm"
)

var HsmCmd = &cobra.Command{
Expand Down
10 changes: 5 additions & 5 deletions cmd/zetaclientd/import_relayer_keys.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"

"github.com/zeta-chain/zetacore/pkg/chains"
"github.com/zeta-chain/zetacore/pkg/crypto"
zetaos "github.com/zeta-chain/zetacore/pkg/os"
"github.com/zeta-chain/zetacore/zetaclient/config"
"github.com/zeta-chain/zetacore/zetaclient/keys"
"github.com/zeta-chain/node/pkg/chains"
"github.com/zeta-chain/node/pkg/crypto"
zetaos "github.com/zeta-chain/node/pkg/os"
"github.com/zeta-chain/node/zetaclient/config"
"github.com/zeta-chain/node/zetaclient/keys"
)

var CmdImportRelayerKey = &cobra.Command{
Expand Down
4 changes: 2 additions & 2 deletions cmd/zetaclientd/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"github.com/rs/zerolog"
"github.com/spf13/cobra"

"github.com/zeta-chain/zetacore/zetaclient/config"
"github.com/zeta-chain/zetacore/zetaclient/testutils"
"github.com/zeta-chain/node/zetaclient/config"
"github.com/zeta-chain/node/zetaclient/testutils"
)

var InitCmd = &cobra.Command{
Expand Down
14 changes: 7 additions & 7 deletions cmd/zetaclientd/keygen_tss.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ import (
"gitlab.com/thorchain/tss/go-tss/tss"
"golang.org/x/crypto/sha3"

"github.com/zeta-chain/zetacore/pkg/chains"
observertypes "github.com/zeta-chain/zetacore/x/observer/types"
"github.com/zeta-chain/zetacore/zetaclient/chains/interfaces"
zctx "github.com/zeta-chain/zetacore/zetaclient/context"
"github.com/zeta-chain/zetacore/zetaclient/metrics"
mc "github.com/zeta-chain/zetacore/zetaclient/tss"
"github.com/zeta-chain/zetacore/zetaclient/zetacore"
"github.com/zeta-chain/node/pkg/chains"
observertypes "github.com/zeta-chain/node/x/observer/types"
"github.com/zeta-chain/node/zetaclient/chains/interfaces"
zctx "github.com/zeta-chain/node/zetaclient/context"
"github.com/zeta-chain/node/zetaclient/metrics"
mc "github.com/zeta-chain/node/zetaclient/tss"
"github.com/zeta-chain/node/zetaclient/zetacore"
)

// GenerateTSS generates a new TSS if keygen is set.
Expand Down
4 changes: 2 additions & 2 deletions cmd/zetaclientd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/cosmos/cosmos-sdk/types"
ecdsakeygen "gitlab.com/thorchain/tss/tss-lib/ecdsa/keygen"

"github.com/zeta-chain/zetacore/app"
"github.com/zeta-chain/zetacore/cmd"
"github.com/zeta-chain/node/app"
"github.com/zeta-chain/node/cmd"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions cmd/zetaclientd/p2p_diagnostics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
maddr "github.com/multiformats/go-multiaddr"
"github.com/rs/zerolog"

"github.com/zeta-chain/zetacore/pkg/cosmos"
"github.com/zeta-chain/zetacore/zetaclient/config"
"github.com/zeta-chain/zetacore/zetaclient/metrics"
"github.com/zeta-chain/node/pkg/cosmos"
"github.com/zeta-chain/node/zetaclient/config"
"github.com/zeta-chain/node/zetaclient/metrics"
)

func RunDiagnostics(
Expand Down
26 changes: 13 additions & 13 deletions cmd/zetaclientd/start.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ import (
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"

"github.com/zeta-chain/zetacore/pkg/authz"
"github.com/zeta-chain/zetacore/pkg/chains"
"github.com/zeta-chain/zetacore/pkg/constant"
zetaos "github.com/zeta-chain/zetacore/pkg/os"
observerTypes "github.com/zeta-chain/zetacore/x/observer/types"
"github.com/zeta-chain/zetacore/zetaclient/chains/base"
"github.com/zeta-chain/zetacore/zetaclient/config"
zctx "github.com/zeta-chain/zetacore/zetaclient/context"
"github.com/zeta-chain/zetacore/zetaclient/maintenance"
"github.com/zeta-chain/zetacore/zetaclient/metrics"
"github.com/zeta-chain/zetacore/zetaclient/orchestrator"
mc "github.com/zeta-chain/zetacore/zetaclient/tss"
"github.com/zeta-chain/zetacore/zetaclient/zetacore"
"github.com/zeta-chain/node/pkg/authz"
"github.com/zeta-chain/node/pkg/chains"
"github.com/zeta-chain/node/pkg/constant"
zetaos "github.com/zeta-chain/node/pkg/os"
observerTypes "github.com/zeta-chain/node/x/observer/types"
"github.com/zeta-chain/node/zetaclient/chains/base"
"github.com/zeta-chain/node/zetaclient/config"
zctx "github.com/zeta-chain/node/zetaclient/context"
"github.com/zeta-chain/node/zetaclient/maintenance"
"github.com/zeta-chain/node/zetaclient/metrics"
"github.com/zeta-chain/node/zetaclient/orchestrator"
mc "github.com/zeta-chain/node/zetaclient/tss"
"github.com/zeta-chain/node/zetaclient/zetacore"
)

var StartCmd = &cobra.Command{
Expand Down
Loading

0 comments on commit b516a46

Please sign in to comment.