Skip to content

Commit

Permalink
fix: append v2 to module name (#1307)
Browse files Browse the repository at this point in the history
# Related Github tickets

- VolumeFi#2136

# Background

From v2 onwards, go forces us to either:
- create a new directory for every version and maintain all versions
within the codebase
- append the version to the module name

We opted for the latter since we don't want to support multiple paloma
versions.

# Testing completed

- [ ] test coverage exists or has been added/updated
- [ ] tested in a private testnet

# Breaking changes

- [ ] I have checked my code for breaking changes
- [ ] If there are breaking changes, there is a supporting migration.
  • Loading branch information
maharifu authored Oct 1, 2024
1 parent ac0a911 commit eea138b
Show file tree
Hide file tree
Showing 485 changed files with 1,046 additions and 1,046 deletions.
66 changes: 33 additions & 33 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,39 +120,39 @@ import (
ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
palomamempool "github.com/palomachain/paloma/app/mempool"
chainparams "github.com/palomachain/paloma/app/params"
xchain "github.com/palomachain/paloma/internal/x-chain"
"github.com/palomachain/paloma/util/libcons"
consensusmodule "github.com/palomachain/paloma/x/consensus"
consensusmodulekeeper "github.com/palomachain/paloma/x/consensus/keeper"
consensusmoduletypes "github.com/palomachain/paloma/x/consensus/types"
"github.com/palomachain/paloma/x/evm"
evmclient "github.com/palomachain/paloma/x/evm/client"
evmmodulekeeper "github.com/palomachain/paloma/x/evm/keeper"
evmmoduletypes "github.com/palomachain/paloma/x/evm/types"
"github.com/palomachain/paloma/x/metrix"
metrixmodulekeeper "github.com/palomachain/paloma/x/metrix/keeper"
metrixmoduletypes "github.com/palomachain/paloma/x/metrix/types"
palomamodule "github.com/palomachain/paloma/x/paloma"
palomaclient "github.com/palomachain/paloma/x/paloma/client"
palomamodulekeeper "github.com/palomachain/paloma/x/paloma/keeper"
palomamoduletypes "github.com/palomachain/paloma/x/paloma/types"
schedulermodule "github.com/palomachain/paloma/x/scheduler"
schedulermodulekeeper "github.com/palomachain/paloma/x/scheduler/keeper"
schedulermoduletypes "github.com/palomachain/paloma/x/scheduler/types"
skywaymodule "github.com/palomachain/paloma/x/skyway"
skywayclient "github.com/palomachain/paloma/x/skyway/client"
skywaymodulekeeper "github.com/palomachain/paloma/x/skyway/keeper"
skywaymoduletypes "github.com/palomachain/paloma/x/skyway/types"
treasurymodule "github.com/palomachain/paloma/x/treasury"
treasuryclient "github.com/palomachain/paloma/x/treasury/client"
treasurymodulekeeper "github.com/palomachain/paloma/x/treasury/keeper"
treasurymoduletypes "github.com/palomachain/paloma/x/treasury/types"
valsetmodule "github.com/palomachain/paloma/x/valset"
valsetclient "github.com/palomachain/paloma/x/valset/client"
valsetmodulekeeper "github.com/palomachain/paloma/x/valset/keeper"
valsetmoduletypes "github.com/palomachain/paloma/x/valset/types"
palomamempool "github.com/palomachain/paloma/v2/app/mempool"
chainparams "github.com/palomachain/paloma/v2/app/params"
xchain "github.com/palomachain/paloma/v2/internal/x-chain"
"github.com/palomachain/paloma/v2/util/libcons"
consensusmodule "github.com/palomachain/paloma/v2/x/consensus"
consensusmodulekeeper "github.com/palomachain/paloma/v2/x/consensus/keeper"
consensusmoduletypes "github.com/palomachain/paloma/v2/x/consensus/types"
"github.com/palomachain/paloma/v2/x/evm"
evmclient "github.com/palomachain/paloma/v2/x/evm/client"
evmmodulekeeper "github.com/palomachain/paloma/v2/x/evm/keeper"
evmmoduletypes "github.com/palomachain/paloma/v2/x/evm/types"
"github.com/palomachain/paloma/v2/x/metrix"
metrixmodulekeeper "github.com/palomachain/paloma/v2/x/metrix/keeper"
metrixmoduletypes "github.com/palomachain/paloma/v2/x/metrix/types"
palomamodule "github.com/palomachain/paloma/v2/x/paloma"
palomaclient "github.com/palomachain/paloma/v2/x/paloma/client"
palomamodulekeeper "github.com/palomachain/paloma/v2/x/paloma/keeper"
palomamoduletypes "github.com/palomachain/paloma/v2/x/paloma/types"
schedulermodule "github.com/palomachain/paloma/v2/x/scheduler"
schedulermodulekeeper "github.com/palomachain/paloma/v2/x/scheduler/keeper"
schedulermoduletypes "github.com/palomachain/paloma/v2/x/scheduler/types"
skywaymodule "github.com/palomachain/paloma/v2/x/skyway"
skywayclient "github.com/palomachain/paloma/v2/x/skyway/client"
skywaymodulekeeper "github.com/palomachain/paloma/v2/x/skyway/keeper"
skywaymoduletypes "github.com/palomachain/paloma/v2/x/skyway/types"
treasurymodule "github.com/palomachain/paloma/v2/x/treasury"
treasuryclient "github.com/palomachain/paloma/v2/x/treasury/client"
treasurymodulekeeper "github.com/palomachain/paloma/v2/x/treasury/keeper"
treasurymoduletypes "github.com/palomachain/paloma/v2/x/treasury/types"
valsetmodule "github.com/palomachain/paloma/v2/x/valset"
valsetclient "github.com/palomachain/paloma/v2/x/valset/client"
valsetmodulekeeper "github.com/palomachain/paloma/v2/x/valset/keeper"
valsetmoduletypes "github.com/palomachain/paloma/v2/x/valset/types"
"github.com/spf13/cast"
)

Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package app

import (
"github.com/cosmos/cosmos-sdk/std"
"github.com/palomachain/paloma/app/params"
"github.com/palomachain/paloma/v2/app/params"
)

// MakeEncodingConfig returns the application's encoding configuration with all
Expand Down
2 changes: 1 addition & 1 deletion app/simulation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
simulationtypes "github.com/cosmos/cosmos-sdk/types/simulation"
"github.com/cosmos/cosmos-sdk/x/simulation"
simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
palomaapp "github.com/palomachain/paloma/app"
palomaapp "github.com/palomachain/paloma/v2/app"
"github.com/stretchr/testify/require"
)

Expand Down
10 changes: 5 additions & 5 deletions app/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import (
icacontrollertypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/types"
icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types"
ibcfeetypes "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/types"
keeperutil "github.com/palomachain/paloma/util/keeper"
consensusmoduletypes "github.com/palomachain/paloma/x/consensus/types"
metrixmoduletypes "github.com/palomachain/paloma/x/metrix/types"
palomamoduletypes "github.com/palomachain/paloma/x/paloma/types"
skywaymoduletypes "github.com/palomachain/paloma/x/skyway/types"
keeperutil "github.com/palomachain/paloma/v2/util/keeper"
consensusmoduletypes "github.com/palomachain/paloma/v2/x/consensus/types"
metrixmoduletypes "github.com/palomachain/paloma/v2/x/metrix/types"
palomamoduletypes "github.com/palomachain/paloma/v2/x/paloma/types"
skywaymoduletypes "github.com/palomachain/paloma/v2/x/skyway/types"
)

var minCommissionRate = math.LegacyMustNewDecFromStr("0.05")
Expand Down
2 changes: 1 addition & 1 deletion cmd/palomad/app_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package main

import (
serverconfig "github.com/cosmos/cosmos-sdk/server/config"
palomaapp "github.com/palomachain/paloma/app"
palomaapp "github.com/palomachain/paloma/v2/app"
)

type (
Expand Down
6 changes: 3 additions & 3 deletions cmd/palomad/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/cosmos/cosmos-sdk/x/crisis"
genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
"github.com/palomachain/paloma/app"
palomaapp "github.com/palomachain/paloma/app"
"github.com/palomachain/paloma/app/params"
"github.com/palomachain/paloma/v2/app"
palomaapp "github.com/palomachain/paloma/v2/app"
"github.com/palomachain/paloma/v2/app/params"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/palomad/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"os"

svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
"github.com/palomachain/paloma/app"
"github.com/palomachain/paloma/v2/app"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/palomad/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"github.com/cosmos/cosmos-sdk/x/auth/tx"
authtxconfig "github.com/cosmos/cosmos-sdk/x/auth/tx/config"
"github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/palomachain/paloma/app"
palomaapp "github.com/palomachain/paloma/app"
"github.com/palomachain/paloma/app/params"
"github.com/palomachain/paloma/v2/app"
palomaapp "github.com/palomachain/paloma/v2/app"
"github.com/palomachain/paloma/v2/app/params"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/palomachain/paloma
module github.com/palomachain/paloma/v2

go 1.22.2

Expand Down
2 changes: 1 addition & 1 deletion internal/x-chain/mocks/Bridge.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion proto/palomachain/paloma/consensus/consensus_queue.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "amino/amino.proto";

package palomachain.paloma.consensus;

option go_package = "github.com/palomachain/paloma/x/consensus/types";
option go_package = "github.com/palomachain/paloma/v2/x/consensus/types";

// message for storing the queued signed message in the internal queue
message QueuedSignedMessage {
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/consensus/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package palomachain.paloma.consensus;
import "gogoproto/gogo.proto";
import "palomachain/paloma/consensus/params.proto";

option go_package = "github.com/palomachain/paloma/x/consensus/types";
option go_package = "github.com/palomachain/paloma/v2/x/consensus/types";

// GenesisState defines the consensus module's genesis state.
message GenesisState {
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/consensus/packet.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package palomachain.paloma.consensus;

option go_package = "github.com/palomachain/paloma/x/consensus/types";
option go_package = "github.com/palomachain/paloma/v2/x/consensus/types";

message ConsensusPacketData {
oneof packet { NoData noData = 1; }
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/consensus/params.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package palomachain.paloma.consensus;

import "gogoproto/gogo.proto";

option go_package = "github.com/palomachain/paloma/x/consensus/types";
option go_package = "github.com/palomachain/paloma/v2/x/consensus/types";

// Params defines the parameters for the module.
message Params { option (gogoproto.goproto_stringer) = false; }
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/consensus/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "palomachain/paloma/consensus/consensus_queue.proto";
import "palomachain/paloma/consensus/params.proto";
import "google/protobuf/any.proto";

option go_package = "github.com/palomachain/paloma/x/consensus/types";
option go_package = "github.com/palomachain/paloma/v2/x/consensus/types";

// Query defines the gRPC querier service.
service Query {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package palomachain.paloma.consensus;

option go_package = "github.com/palomachain/paloma/x/consensus/types";
option go_package = "github.com/palomachain/paloma/v2/x/consensus/types";

message SimpleMessage {
string sender = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/consensus/tx.proto
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import "google/protobuf/empty.proto";

package palomachain.paloma.consensus;

option go_package = "github.com/palomachain/paloma/x/consensus/types";
option go_package = "github.com/palomachain/paloma/v2/x/consensus/types";

// Msg defines the Msg service.
service Msg {
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/evm/add_chain_proposal.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package palomachain.paloma.evm;

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

message AddChainProposal {
string title = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/evm/chain_info.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package palomachain.paloma.evm;
import "palomachain/paloma/evm/relay_weights.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

message ChainInfo {
uint64 id = 9999;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package palomachain.paloma.evm;

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

message ChangeMinOnChainBalanceProposal {
string title = 1;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package palomachain.paloma.evm;

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

message DeployNewSmartContractProposal {
string title = 1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "google/protobuf/timestamp.proto";

package palomachain.paloma.evm;

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

message ReferenceBlockAttestation {
google.protobuf.Timestamp fromBlockTime = 1
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/evm/evm_state_attestation.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "google/protobuf/timestamp.proto";

package palomachain.paloma.evm;

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

message ValidatorBalancesAttestation {
repeated string hexAddresses = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/evm/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
import "palomachain/paloma/evm/params.proto";
import "palomachain/paloma/evm/relay_weights.proto";

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

// GenesisState defines the evm module's genesis state.
message GenesisState {
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/evm/job.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package palomachain.paloma.evm;

import "gogoproto/gogo.proto";

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

message JobDefinition {
string address = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/evm/params.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package palomachain.paloma.evm;

import "gogoproto/gogo.proto";

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

// Params defines the parameters for the module.
message Params {}
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/evm/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import "palomachain/paloma/evm/turnstone.proto";
import "palomachain/paloma/evm/chain_info.proto";
import "palomachain/paloma/evm/user_smart_contract.proto";

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

// Query defines the gRPC querier service.
service Query {
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/evm/relay_weights.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package palomachain.paloma.evm;

import "cosmos_proto/cosmos.proto";

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

message RelayWeights {
string fee = 1 [ (cosmos_proto.scalar) = "cosmos.Dec" ];
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/evm/relay_weights_proposal.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package palomachain.paloma.evm;

import "cosmos_proto/cosmos.proto";

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

message RelayWeightsProposal {
string title = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/evm/remove_chain_proposal.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package palomachain.paloma.evm;

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

message RemoveChainProposal {

Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/evm/set_fee_mgr_proposal.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package palomachain.paloma.evm;

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

message SetFeeManagerAddressProposal {
string title = 1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package palomachain.paloma.evm;

import "gogoproto/gogo.proto";

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

message SetSmartContractDeployersProposal {
message Deployer {
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/evm/treasury.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import "gogoproto/gogo.proto";

package palomachain.paloma.evm;

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

message FundCollectedEvent {
string jobID = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/evm/turnstone.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "amino/amino.proto";

package palomachain.paloma.evm;

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

message Valset {
// hex addresses on the EVM network
Expand Down
2 changes: 1 addition & 1 deletion proto/palomachain/paloma/evm/tx.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "gogoproto/gogo.proto";
import "google/protobuf/empty.proto";
import "palomachain/paloma/valset/common.proto";

option go_package = "github.com/palomachain/paloma/x/evm/types";
option go_package = "github.com/palomachain/paloma/v2/x/evm/types";

service Msg {
rpc RemoveSmartContractDeployment(MsgRemoveSmartContractDeploymentRequest)
Expand Down
Loading

0 comments on commit eea138b

Please sign in to comment.