Skip to content

Commit

Permalink
- fix v2/v3 for taxexemption module merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@StrathCole
StrathCole committed May 14, 2024
1 parent 8e8c8da commit 8c8100b
Show file tree
Hide file tree
Showing 18 changed files with 24 additions and 24 deletions.
6 changes: 3 additions & 3 deletions app/modules.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ package app
import (
"github.com/CosmWasm/wasmd/x/wasm"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
"github.com/classic-terra/core/v2/x/taxexemption"
taxexemptionclient "github.com/classic-terra/core/v2/x/taxexemption/client"
taxexemptiontypes "github.com/classic-terra/core/v2/x/taxexemption/types"
terraappparams "github.com/classic-terra/core/v3/app/params"
customauth "github.com/classic-terra/core/v3/custom/auth"
customauthsim "github.com/classic-terra/core/v3/custom/auth/simulation"
Expand All @@ -28,6 +25,9 @@ import (
markettypes "github.com/classic-terra/core/v3/x/market/types"
"github.com/classic-terra/core/v3/x/oracle"
oracletypes "github.com/classic-terra/core/v3/x/oracle/types"
"github.com/classic-terra/core/v3/x/taxexemption"
taxexemptionclient "github.com/classic-terra/core/v3/x/taxexemption/client"
taxexemptiontypes "github.com/classic-terra/core/v3/x/taxexemption/types"
"github.com/classic-terra/core/v3/x/treasury"
treasuryclient "github.com/classic-terra/core/v3/x/treasury/client"
treasurytypes "github.com/classic-terra/core/v3/x/treasury/types"
Expand Down
2 changes: 1 addition & 1 deletion custom/wasm/keeper/handler_plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
treasurykeeper "github.com/classic-terra/core/v3/x/treasury/keeper"

wasmvmtypes "github.com/CosmWasm/wasmvm/types"
taxexemptionkeeper "github.com/classic-terra/core/v2/x/taxexemption/keeper"
taxexemptionkeeper "github.com/classic-terra/core/v3/x/taxexemption/keeper"
"github.com/cosmos/cosmos-sdk/baseapp"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
2 changes: 1 addition & 1 deletion proto/terra/taxexemption/v1beta1/genesis.proto
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package terra.taxexemption.v1beta1;

option go_package = "github.com/classic-terra/core/v2/x/taxexemption/types";
option go_package = "github.com/classic-terra/core/v3/x/taxexemption/types";

// GenesisState defines the taxexemption module's genesis state.
message GenesisState {
Expand Down
2 changes: 1 addition & 1 deletion proto/terra/taxexemption/v1beta1/query.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "google/api/annotations.proto";
import "cosmos/base/query/v1beta1/pagination.proto";
import "terra/taxexemption/v1beta1/taxexemption.proto";

option go_package = "github.com/classic-terra/core/v2/x/taxexemption/types";
option go_package = "github.com/classic-terra/core/v3/x/taxexemption/types";

service Query {
rpc Taxable(QueryTaxableRequest) returns (QueryTaxableResponse) {
Expand Down
2 changes: 1 addition & 1 deletion proto/terra/taxexemption/v1beta1/taxexemption.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package terra.taxexemption.v1beta1;
import "gogoproto/gogo.proto";
import "cosmos_proto/cosmos.proto";

option go_package = "github.com/classic-terra/core/v2/x/taxexemption/types";
option go_package = "github.com/classic-terra/core/v3/x/taxexemption/types";

message Zone {
string name = 1 [(gogoproto.moretags) = "yaml:\"name\""];
Expand Down
2 changes: 1 addition & 1 deletion proto/terra/taxexemption/v1beta1/tx.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package terra.taxexemption.v1beta1;

import "gogoproto/gogo.proto";

option go_package = "github.com/classic-terra/core/v2/x/taxexemption/types";
option go_package = "github.com/classic-terra/core/v3/x/taxexemption/types";

// Msg defines the taxexemption Msg service.
service Msg {
Expand Down
2 changes: 1 addition & 1 deletion x/taxexemption/client/cli/gov_tx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"strings"

"github.com/classic-terra/core/v2/x/taxexemption/types"
"github.com/classic-terra/core/v3/x/taxexemption/types"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/tx"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
2 changes: 1 addition & 1 deletion x/taxexemption/client/cli/query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cli
import (
"context"

"github.com/classic-terra/core/v2/x/taxexemption/types"
"github.com/classic-terra/core/v3/x/taxexemption/types"

"github.com/spf13/cobra"

Expand Down
2 changes: 1 addition & 1 deletion x/taxexemption/client/proposal_handler.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
"github.com/classic-terra/core/v2/x/taxexemption/client/cli"
"github.com/classic-terra/core/v3/x/taxexemption/client/cli"
govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
)

Expand Down
4 changes: 2 additions & 2 deletions x/taxexemption/genesis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package taxexemption
import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/classic-terra/core/v2/x/taxexemption/keeper"
"github.com/classic-terra/core/v2/x/taxexemption/types"
"github.com/classic-terra/core/v3/x/taxexemption/keeper"
"github.com/classic-terra/core/v3/x/taxexemption/types"
)

// NewGenesisState creates a new GenesisState object
Expand Down
4 changes: 2 additions & 2 deletions x/taxexemption/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"

"github.com/classic-terra/core/v2/x/taxexemption/keeper"
"github.com/classic-terra/core/v2/x/taxexemption/types"
"github.com/classic-terra/core/v3/x/taxexemption/keeper"
"github.com/classic-terra/core/v3/x/taxexemption/types"
)

// NewHandler creates a new handler for all market type messages.
Expand Down
2 changes: 1 addition & 1 deletion x/taxexemption/keeper/keeper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"github.com/tendermint/tendermint/libs/log"

"github.com/classic-terra/core/v2/x/taxexemption/types"
"github.com/classic-terra/core/v3/x/taxexemption/types"
)

// Keeper of the store
Expand Down
2 changes: 1 addition & 1 deletion x/taxexemption/keeper/keeper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/classic-terra/core/v2/x/taxexemption/types"
"github.com/classic-terra/core/v3/x/taxexemption/types"
)

func TestTaxExemptionList(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion x/taxexemption/keeper/legacy_querier.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package keeper

import (
"github.com/classic-terra/core/v2/x/taxexemption/types"
"github.com/classic-terra/core/v3/x/taxexemption/types"
abci "github.com/tendermint/tendermint/abci/types"

"github.com/cosmos/cosmos-sdk/codec"
Expand Down
2 changes: 1 addition & 1 deletion x/taxexemption/keeper/msg_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/classic-terra/core/v2/x/taxexemption/types"
"github.com/classic-terra/core/v3/x/taxexemption/types"
)

type msgServer struct {
Expand Down
2 changes: 1 addition & 1 deletion x/taxexemption/keeper/querier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/classic-terra/core/v2/x/taxexemption/types"
"github.com/classic-terra/core/v3/x/taxexemption/types"
)

// querier is used as Keeper will have duplicate methods if used directly, and gRPC names take precedence over q
Expand Down
2 changes: 1 addition & 1 deletion x/taxexemption/keeper/test_utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
core "github.com/classic-terra/core/v2/types"
"github.com/classic-terra/core/v2/x/market"
"github.com/classic-terra/core/v2/x/oracle"
"github.com/classic-terra/core/v2/x/taxexemption/types"
"github.com/classic-terra/core/v3/x/taxexemption/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"

Expand Down
6 changes: 3 additions & 3 deletions x/taxexemption/module.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"math/rand"

"github.com/classic-terra/core/v2/x/market/simulation"
"github.com/classic-terra/core/v2/x/taxexemption/client/cli"
"github.com/classic-terra/core/v2/x/taxexemption/keeper"
"github.com/classic-terra/core/v2/x/taxexemption/types"
"github.com/classic-terra/core/v3/x/taxexemption/client/cli"
"github.com/classic-terra/core/v3/x/taxexemption/keeper"
"github.com/classic-terra/core/v3/x/taxexemption/types"
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/spf13/cobra"

Expand Down

0 comments on commit 8c8100b

Please sign in to comment.