Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Upgrade go module version #26

Closed
wants to merge 2 commits into from
Closed

[FIX] Upgrade go module version #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90477cb
fix: upgrade go module version
AdriaCarrera Jun 5, 2024
2a9f2f6
fix: upgrade go module version
AdriaCarrera Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ FROM base AS integration
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin
RUN golangci-lint run
# Unit tests
RUN go test $(go list ./... | grep -v github.com/Peersyst/exrp/tests/e2e/poa)
RUN go test $(go list ./... | grep -v github.com/Peersyst/exrp/v2/tests/e2e/poa)
# End to end tests
# TODO: Temporary disabled e2e tests
# RUN TEST_CLEANUP_DIR=false go test -p 1 -v -timeout 30m ./tests/e2e/...
RUN TEST_CLEANUP_DIR=false go test -p 1 -v -timeout 30m ./tests/e2e/...
RUN touch /test.lock

FROM golang:1.20 AS release
Expand Down
12 changes: 6 additions & 6 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package app

import (
"encoding/json"
poaante "github.com/Peersyst/exrp/x/poa/ante"
poaante "github.com/Peersyst/exrp/v2/x/poa/ante"
distr "github.com/cosmos/cosmos-sdk/x/distribution"
distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
Expand All @@ -21,7 +21,7 @@ import (
reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
"cosmossdk.io/simapp"
simappparams "cosmossdk.io/simapp/params"
"github.com/Peersyst/exrp/x/poa"
"github.com/Peersyst/exrp/v2/x/poa"
"github.com/cosmos/cosmos-sdk/runtime"
runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services"
"github.com/cosmos/cosmos-sdk/x/auth/posthandler"
Expand Down Expand Up @@ -107,11 +107,11 @@ import (
ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
// this line is used by starport scaffolding # stargate/app/moduleImport

"github.com/Peersyst/exrp/docs"
poakeeper "github.com/Peersyst/exrp/x/poa/keeper"
poatypes "github.com/Peersyst/exrp/x/poa/types"
"github.com/Peersyst/exrp/v2/docs"
poakeeper "github.com/Peersyst/exrp/v2/x/poa/keeper"
poatypes "github.com/Peersyst/exrp/v2/x/poa/types"

// "github.com/Peersyst/exrp/app/ante"
// "github.com/Peersyst/exrp/v2/app/ante"
"github.com/evmos/evmos/v15/app/ante"
srvflags "github.com/evmos/evmos/v15/server/flags"

Expand Down
2 changes: 1 addition & 1 deletion app/simulation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package app_test

import (
"github.com/Peersyst/exrp/app"
"github.com/Peersyst/exrp/v2/app"
dbm "github.com/cometbft/cometbft-db"
"github.com/cometbft/cometbft/libs/log"
"github.com/cosmos/cosmos-sdk/baseapp"
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package app
import (
"fmt"

v2 "github.com/Peersyst/exrp/app/upgrades/v2"
v2 "github.com/Peersyst/exrp/v2/app/upgrades/v2"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
Expand Down
2 changes: 1 addition & 1 deletion cmd/exrpd/cmd/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd

import (
"github.com/Peersyst/exrp/app"
"github.com/Peersyst/exrp/v2/app"
sdk "github.com/cosmos/cosmos-sdk/types"
ethermint "github.com/evmos/evmos/v15/types"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/exrpd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"path/filepath"
// this line is used by starport scaffolding # root/moduleImport

"github.com/Peersyst/exrp/app"
"github.com/Peersyst/exrp/v2/app"
ethermintclient "github.com/evmos/evmos/v15/client"
ethermintserver "github.com/evmos/evmos/v15/server"
ethermintservercfg "github.com/evmos/evmos/v15/server/config"
Expand Down
4 changes: 2 additions & 2 deletions cmd/exrpd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/cosmos/cosmos-sdk/server"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

"github.com/Peersyst/exrp/app"
"github.com/Peersyst/exrp/cmd/exrpd/cmd"
"github.com/Peersyst/exrp/v2/app"
"github.com/Peersyst/exrp/v2/cmd/exrpd/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion proto/packages/blockchain/poa/genesis.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package packages.blockchain.poa;
import "gogoproto/gogo.proto";
import "packages/blockchain/poa/params.proto";

option go_package = "github.com/Peersyst/exrp/x/poa/types";
option go_package = "github.com/Peersyst/exrp/v2/x/poa/types";

// GenesisState defines the poa module's genesis state.
message GenesisState {
Expand Down
2 changes: 1 addition & 1 deletion proto/packages/blockchain/poa/params.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package packages.blockchain.poa;

import "gogoproto/gogo.proto";

option go_package = "github.com/Peersyst/exrp/x/poa/types";
option go_package = "github.com/Peersyst/exrp/v2/x/poa/types";

// Params defines the parameters for the module.
message Params {
Expand Down
2 changes: 1 addition & 1 deletion proto/packages/blockchain/poa/query.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "google/api/annotations.proto";
import "cosmos/base/query/v1beta1/pagination.proto";
import "packages/blockchain/poa/params.proto";

option go_package = "github.com/Peersyst/exrp/x/poa/types";
option go_package = "github.com/Peersyst/exrp/v2/x/poa/types";

// Query defines the gRPC querier service.
service Query {
Expand Down
2 changes: 1 addition & 1 deletion proto/packages/blockchain/poa/tx.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import "cosmos/staking/v1beta1/staking.proto";
import "google/protobuf/any.proto";
import "amino/amino.proto";

option go_package = "github.com/Peersyst/exrp/x/poa/types";
option go_package = "github.com/Peersyst/exrp/v2/x/poa/types";

// Msg defines the Msg service.
service Msg {
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/poa/add_validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package poa_test

import (
"github.com/Peersyst/exrp/tests/e2e"
"github.com/Peersyst/exrp/v2/tests/e2e"
sdk "github.com/cosmos/cosmos-sdk/types"
govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/poa/ante_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package poa_test

import (
"github.com/Peersyst/exrp/tests/e2e"
"github.com/Peersyst/exrp/v2/tests/e2e"
"strings"
)

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/poa/delegation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package poa_test

import (
"github.com/Peersyst/exrp/tests/e2e"
"github.com/Peersyst/exrp/v2/tests/e2e"
sdk "github.com/cosmos/cosmos-sdk/types"
)

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/poa/poa_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package poa_test

import (
"github.com/Peersyst/exrp/tests/e2e"
"github.com/Peersyst/exrp/v2/tests/e2e"
"github.com/stretchr/testify/suite"
"testing"
"time"
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/poa/remove_validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package poa_test

import (
"github.com/Peersyst/exrp/tests/e2e"
"github.com/Peersyst/exrp/v2/tests/e2e"
sdk "github.com/cosmos/cosmos-sdk/types"
govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
"time"
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/poa/unbonding/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package unbonding_test

import (
"github.com/Peersyst/exrp/tests/e2e"
"github.com/Peersyst/exrp/v2/tests/e2e"
"github.com/stretchr/testify/suite"
"testing"
"time"
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/poa/unbonding/unbonding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package unbonding_test

import (
"github.com/Peersyst/exrp/tests/e2e"
"github.com/Peersyst/exrp/v2/tests/e2e"
govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
"sync"
"time"
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/test_suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package e2e

import (
"fmt"
"github.com/Peersyst/exrp/testutil/network"
"github.com/Peersyst/exrp/v2/testutil/network"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/stretchr/testify/suite"
"time"
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/util_transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ package e2e

import (
"fmt"
"github.com/Peersyst/exrp/x/poa/types"
"github.com/Peersyst/exrp/v2/x/poa/types"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
"github.com/spf13/cobra"
"time"

"github.com/Peersyst/exrp/testutil/network"
"github.com/Peersyst/exrp/v2/testutil/network"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/testutil"
Expand Down
2 changes: 1 addition & 1 deletion testutil/abci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
tmtypes "github.com/cometbft/cometbft/types"
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/Peersyst/exrp/app"
"github.com/Peersyst/exrp/v2/app"
)

// Commit commits a block at a given time. Reminder: At the end of each
Expand Down
2 changes: 1 addition & 1 deletion testutil/fund.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package testutil

import (
poatypes "github.com/Peersyst/exrp/x/poa/types"
poatypes "github.com/Peersyst/exrp/v2/x/poa/types"
sdk "github.com/cosmos/cosmos-sdk/types"
bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
Expand Down
2 changes: 1 addition & 1 deletion testutil/network/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (

"cosmossdk.io/simapp"
"cosmossdk.io/simapp/params"
"github.com/Peersyst/exrp/app"
"github.com/Peersyst/exrp/v2/app"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/tx"
Expand Down
2 changes: 1 addition & 1 deletion testutil/network/network_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/stretchr/testify/suite"

"github.com/Peersyst/exrp/testutil/network"
"github.com/Peersyst/exrp/v2/testutil/network"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/evmos/evmos/v15/server/config"
)
Expand Down
2 changes: 1 addition & 1 deletion testutil/tx/cosmos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/cosmos/cosmos-sdk/types/tx/signing"
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"

"github.com/Peersyst/exrp/app"
"github.com/Peersyst/exrp/v2/app"
"github.com/evmos/evmos/v15/utils"
)

Expand Down
2 changes: 1 addition & 1 deletion testutil/tx/eip712.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/signer/core/apitypes"

"github.com/Peersyst/exrp/app"
"github.com/Peersyst/exrp/v2/app"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
cryptocodec "github.com/evmos/evmos/v15/crypto/codec"
"github.com/evmos/evmos/v15/ethereum/eip712"
Expand Down
2 changes: 1 addition & 1 deletion x/poa/client/cli/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
// "github.com/cosmos/cosmos-sdk/client/flags"
// sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/Peersyst/exrp/x/poa/types"
"github.com/Peersyst/exrp/v2/x/poa/types"
)

// GetQueryCmd returns the cli query commands for this module
Expand Down
2 changes: 1 addition & 1 deletion x/poa/client/cli/query_params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cli
import (
"context"

"github.com/Peersyst/exrp/x/poa/types"
"github.com/Peersyst/exrp/v2/x/poa/types"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion x/poa/client/cli/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
flag "github.com/spf13/pflag"
"strings"

"github.com/Peersyst/exrp/x/poa/types"
"github.com/Peersyst/exrp/v2/x/poa/types"
"github.com/cosmos/cosmos-sdk/client/flags"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/gov/client/cli"
Expand Down
2 changes: 1 addition & 1 deletion x/poa/keeper/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package keeper

import (
"github.com/Peersyst/exrp/x/poa/types"
"github.com/Peersyst/exrp/v2/x/poa/types"
sdk "github.com/cosmos/cosmos-sdk/types"
)

Expand Down
2 changes: 1 addition & 1 deletion x/poa/keeper/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

"github.com/Peersyst/exrp/x/poa/types"
"github.com/Peersyst/exrp/v2/x/poa/types"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion x/poa/keeper/msg_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package keeper

import (
"github.com/Peersyst/exrp/x/poa/types"
"github.com/Peersyst/exrp/v2/x/poa/types"
)

type msgServer struct {
Expand Down
2 changes: 1 addition & 1 deletion x/poa/keeper/msg_server_add_validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"github.com/cosmos/cosmos-sdk/types/errors"

"github.com/Peersyst/exrp/x/poa/types"
"github.com/Peersyst/exrp/v2/x/poa/types"
sdk "github.com/cosmos/cosmos-sdk/types"
gov "github.com/cosmos/cosmos-sdk/x/gov/types"
)
Expand Down
2 changes: 1 addition & 1 deletion x/poa/keeper/msg_server_remove_validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/cosmos/cosmos-sdk/types/errors"
gov "github.com/cosmos/cosmos-sdk/x/gov/types"

"github.com/Peersyst/exrp/x/poa/types"
"github.com/Peersyst/exrp/v2/x/poa/types"
sdk "github.com/cosmos/cosmos-sdk/types"
)

Expand Down
2 changes: 1 addition & 1 deletion x/poa/keeper/params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package keeper

import (
"github.com/Peersyst/exrp/x/poa/types"
"github.com/Peersyst/exrp/v2/x/poa/types"
sdk "github.com/cosmos/cosmos-sdk/types"
)

Expand Down
2 changes: 1 addition & 1 deletion x/poa/keeper/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package keeper

import (
"github.com/Peersyst/exrp/x/poa/types"
"github.com/Peersyst/exrp/v2/x/poa/types"
)

var _ types.QueryServer = Keeper{}
2 changes: 1 addition & 1 deletion x/poa/keeper/query_params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package keeper
import (
"context"

"github.com/Peersyst/exrp/x/poa/types"
"github.com/Peersyst/exrp/v2/x/poa/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
Expand Down
6 changes: 3 additions & 3 deletions x/poa/module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (

abci "github.com/cometbft/cometbft/abci/types"

"github.com/Peersyst/exrp/x/poa/client/cli"
"github.com/Peersyst/exrp/x/poa/keeper"
"github.com/Peersyst/exrp/x/poa/types"
"github.com/Peersyst/exrp/v2/x/poa/client/cli"
"github.com/Peersyst/exrp/v2/x/poa/keeper"
"github.com/Peersyst/exrp/v2/x/poa/types"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
Expand Down
6 changes: 3 additions & 3 deletions x/poa/module_simulation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package poa
import (
"math/rand"

"github.com/Peersyst/exrp/testutil/sample"
poasimulation "github.com/Peersyst/exrp/x/poa/simulation"
"github.com/Peersyst/exrp/x/poa/types"
"github.com/Peersyst/exrp/v2/testutil/sample"
poasimulation "github.com/Peersyst/exrp/v2/x/poa/simulation"
"github.com/Peersyst/exrp/v2/x/poa/types"
"github.com/cosmos/cosmos-sdk/baseapp"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
Expand Down
Loading
Loading