8000 feat(inflation): rename inflation to inflation v1 by fedekunze · Pull Request #2015 · evmos/evmos · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

feat(inflation): rename inflation to inflation v1 #2015

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.

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

Merged
merged 4 commits into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ Ref: https://keepachangelog.com/en/1.0.0/

## Unreleased

### API Breaking

- (inflation) [#2015](https://github.com/evmos/evmos/pull/2015) Rename `inflation` module to `inflation/v1`.

### Features

- (p256) [#1922](https://github.com/evmos/evmos/pull/1922) [EIP-7212](https://eips.ethereum.org/EIPS/eip-7212) `secp256r1` curve precompile
Expand Down
6 changes: 3 additions & 3 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,9 @@ import (
incentivesclient "github.com/evmos/evmos/v15/x/incentives/client"
incentiveskeeper "github.com/evmos/evmos/v15/x/incentives/keeper"
incentivestypes "github.com/evmos/evmos/v15/x/incentives/types"
"github.com/evmos/evmos/v15/x/inflati F438 on"
inflationkeeper "github.com/evmos/evmos/v15/x/inflation/keeper"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflation "github.com/evmos/evmos/v15/x/inflation/v1"
inflationkeeper "github.com/evmos/evmos/v15/x/inflation/v1/keeper"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
"github.com/evmos/evmos/v15/x/recovery"
recoverykeeper "github.com/evmos/evmos/v15/x/recovery/keeper"
recoverytypes "github.com/evmos/evmos/v15/x/recovery/types"
Expand Down
2 changes: 1 addition & 1 deletion app/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
evmtypes "github.com/evmos/evmos/v15/x/evm/types"
feemarkettypes "github.com/evmos/evmos/v15/x/feemarket/types"
incentivestypes "github.com/evmos/evmos/v15/x/incentives/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
recoverytypes "github.com/evmos/evmos/v15/x/recovery/types"
revenuetypes "github.com/evmos/evmos/v15/x/revenue/v1/types"
vestingtypes "github.com/evmos/evmos/v15/x/vesting/types"
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v14/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/evmos/evmos/v15/utils"
"github.com/evmos/evmos/v15/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v15/x/evm/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
)

// SetupWithGenesisValSet initializes a new EvmosApp with a validator set and genesis accounts
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v15/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
evmostypes "github.com/evmos/evmos/v15/types"
"github.com/evmos/evmos/v15/utils"
evmtypes "github.com/evmos/evmos/v15/x/evm/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
)

// SetupWithGenesisValSet initializes a new EvmosApp with a validator set and genesis accounts
Expand Down
2 changes: 1 addition & 1 deletion precompiles/distribution/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/evmos/evmos/v15/utils"
"github.com/evmos/evmos/v15/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v15/x/evm/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
)

// SetupWithGenesisValSet initializes a new EvmosApp with a validator set and genesis accounts
Expand Down
2 changes: 1 addition & 1 deletion precompiles/ics20/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
teststypes "github.com/evmos/evmos/v15/types/tests"
"github.com/evmos/evmos/v15/utils"
erc20types "github.com/evmos/evmos/v15/x/erc20/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"

//nolint:revive // dot imports are fine for Ginkgo
. "github.com/onsi/ginkgo/v2"
Expand Down
2 changes: 1 addition & 1 deletion precompiles/ics20/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import (
"github.com/evmos/evmos/v15/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v15/x/evm/types"
feemarkettypes "github.com/evmos/evmos/v15/x/feemarket/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"

//nolint:revive // dot imports are fine for Ginkgo
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion precompiles/outposts/stride/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
"github.com/evmos/evmos/v15/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v15/x/evm/types"
feemarkettypes "github.com/evmos/evmos/v15/x/feemarket/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion precompiles/staking/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
"github.com/evmos/evmos/v15/utils"
"github.com/evmos/evmos/v15/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v15/x/evm/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
"golang.org/x/exp/slices"
)

Expand Down
2 changes: 1 addition & 1 deletion precompiles/vesting/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/evmos/evmos/v15/utils"
"github.com/evmos/evmos/v15/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v15/x/evm/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
vestingtypes "github.com/evmos/evmos/v15/x/vesting/types"

//nolint:revive // dot imports are fine for Ginkgo
Expand Down
2 changes: 1 addition & 1 deletion proto/evmos/inflation/v1/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "gogoproto/gogo.proto";

import "evmos/inflation/v1/inflation.proto";

option go_package = "github.com/evmos/evmos/v15/x/inflation/types";
option go_package = "github.com/evmos/evmos/v15/x/inflation/v1/types";

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

import "gogoproto/gogo.proto";

option go_package = "github.com/evmos/evmos/v15/x/inflation/types";
option go_package = "github.com/evmos/evmos/v15/x/inflation/v1/types";

// InflationDistribution defines the distribution in which inflation is
// allocated through minting on each epoch (staking, incentives, community). It
Expand Down
2 changes: 1 addition & 1 deletion proto/evmos/inflation/v1/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import "evmos/inflation/v1/genesis.proto";
import "gogoproto/gogo.proto";
import "google/api/annotations.proto";

option go_package = "github.com/evmos/evmos/v15/x/inflation/types";
option go_package = "github.com/evmos/evmos/v15/x/inflation/v1/types";

// Query provides defines the gRPC querier service.
service Query {
Expand Down
2 changes: 1 addition & 1 deletion proto/evmos/inflation/v1/tx.proto
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import "cosmos_proto/cosmos.proto";
import "evmos/inflation/v1/genesis.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/evmos/evmos/v15/x/inflation/types";
option go_package = "github.com/evmos/evmos/v15/x/inflation/v1/types";

// Msg defines the evm Msg service.
service Msg {
Expand Down
2 changes: 1 addition & 1 deletion testutil/fund.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
"github.com/evmos/evmos/v15/utils"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
)

// FundAccount is a utility function that funds an account by minting and
Expand Down
2 changes: 1 addition & 1 deletion testutil/integration/evmos/network/clients.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/evmos/evmos/v15/encoding"
evmtypes "github.com/evmos/evmos/v15/x/evm/types"
feemarkettypes "github.com/evmos/evmos/v15/x/feemarket/types"
infltypes "github.com/evmos/evmos/v15/x/inflation/types"
infltypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
revtypes "github.com/evmos/evmos/v15/x/revenue/v1/types"
)

Expand Down
2 changes: 1 addition & 1 deletion testutil/integration/evmos/network/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
evmtypes "github.com/evmos/evmos/v15/x/evm/types"
feemarkettypes "github.com/evmos/evmos/v15/x/feemarket/types"
infltypes "github.com/evmos/evmos/v15/x/inflation/types"
infltypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
revtypes "github.com/evmos/evmos/v15/x/revenue/v1/types"
)

Expand Down
2 changes: 1 addition & 1 deletion testutil/integration/evmos/network/params.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package network

import (
evmtypes "github.com/evmos/evmos/v15/x/evm/types"
infltypes "github.com/evmos/evmos/v15/x/inflation/types"
infltypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
revtypes "github.com/evmos/evmos/v15/x/revenue/v1/types"
)

Expand Down
2 changes: 1 addition & 1 deletion testutil/integration/evmos/network/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
epochstypes "github.com/evmos/evmos/v15/x/epochs/types"
infltypes "github.com/evmos/evmos/v15/x/inflation/types"
infltypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
)

// createValidatorSetAndSigners creates validator set with the amount of validators specified
Expand Down
2 changes: 1 addition & 1 deletion testutil/network/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"

"github.com/evmos/evmos/v15/server"
evmtypes "github.com/evmos/evmos/v15/x/evm/types"
Expand Down
2 changes: 1 addition & 1 deletion x/claims/keeper/claim_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/evmos/evmos/v15/testutil"
utiltx "github.com/evmos/evmos/v15/testutil/tx"
evmostypes "github.com/evmos/evmos/v15/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"

"github.com/evmos/evmos/v15/x/claims/types"
)
Expand Down
2 changes: 1 addition & 1 deletion x/claims/keeper/ibc_callbacks_ibc_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
utiltx "github.com/evmos/evmos/v15/testutil/tx"
"github.com/evmos/evmos/v15/utils"
"github.com/evmos/evmos/v15/x/claims/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
)

type IBCTestingSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion x/claims/keeper/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/evmos/evmos/v15/testutil/tx"
"github.com/evmos/evmos/v15/utils"
"github.com/evmos/evmos/v15/x/claims/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
)

var _ = Describe("Claiming", Ordered, func() {
Expand Down
2 changes: 1 addition & 1 deletion x/erc20/keeper/ibc_callbacks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/evmos/evmos/v15/contracts"
claimstypes "github.com/evmos/evmos/v15/x/claims/types"
"github.com/evmos/evmos/v15/x/erc20/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
vestingtypes "github.com/evmos/evmos/v15/x/vesting/types"
)

Expand Down
2 changes: 1 addition & 1 deletion x/erc20/keeper/proposals_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

"github.com/evmos/evmos/v15/x/erc20/keeper"
"github.com/evmos/evmos/v15/x/erc20/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion x/erc20/keeper/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"github.com/evmos/evmos/v15/x/evm/statedb"
evm "github.com/evmos/evmos/v15/x/evm/types"
feemarkettypes "github.com/evmos/evmos/v15/x/feemarket/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion x/incentives/types/interfaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/evmos/evmos/v15/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v15/x/evm/types"

inflationtypes "github.com/evmos/evmos/v15/x/inflation/types"
inflationtypes "github.com/evmos/evmos/v15/x/inflation/v1/types"
)

// AccountKeeper defines the expected interface needed to retrieve account info.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/evmos/evmos/v15/x/inflation/types"
"github.com/evmos/evmos/v15/x/inflation/v1/types"
)

// GetQueryCmd returns the cli query commands for the inflation module.
Expand Down
4 changes: 2 additions & 2 deletions x/inflation/genesis.go → x/inflation/v1/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package inflation
import (
errorsmod "cosmossdk.io/errors"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/evmos/evmos/v15/x/inflation/keeper"
"github.com/evmos/evmos/v15/x/inflation/types"
"github.com/evmos/evmos/v15/x/inflation/v1/keeper"
"github.com/evmos/evmos/v15/x/inflation/v1/types"
)

// InitGenesis import module genesis
Expand Down
2 changes: 1 addition & 1 deletion x/inflation/handler.go → x/inflation/v1/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
errorsmod "cosmossdk.io/errors"
sdk "github.com/cosmos/cosmos-sdk/types"
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/evmos/evmos/v15/x/inflation/types"
"github.com/evmos/evmos/v15/x/inflation/v1/types"
)

// NewHandler returns a handler for Inflation type messages.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package keeper

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/evmos/evmos/v15/x/inflation/types"
"github.com/evmos/evmos/v15/x/inflation/v1/types"
)

// GetEpochIdentifier gets the epoch identifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

epochstypes "github.com/evmos/evmos/v15/x/epochs/types"
"github.com/evmos/evmos/v15/x/inflation/types"
"github.com/evmos/evmos/v15/x/inflation/v1/types"
)

func (suite *KeeperTestSuite) TestSetGetEpochIdentifier() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"context"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/evmos/evmos/v15/x/inflation/types"
"github.com/evmos/evmos/v15/x/inflation/v1/types"
)

var _ types.QueryServer = Keeper{}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"

evmostypes "github.com/evmos/evmos/v15/types"
"github.com/evmos/evmos/v15/x/inflation/types"
"github.com/evmos/evmos/v15/x/inflation/v1/types"
)

func (suite *KeeperTestSuite) TestPeriod() { //nolint:dupl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/cosmos/cosmos-sdk/telemetry"
sdk "github.com/cosmos/cosmos-sdk/types"
epochstypes "github.com/evmos/evmos/v15/x/epochs/types"
"github.com/evmos/evmos/v15/x/inflation/types"
"github.com/evmos/evmos/v15/x/inflation/v1/types"
)

// BeforeEpochStart: noop, We don't need to do anything here
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"time"

epochstypes "github.com/evmos/evmos/v15/x/epochs/types"
"github.com/evmos/evmos/v15/x/inflation/types"
"github.com/evmos/evmos/v15/x/inflation/v1/types"
)

func (suite *KeeperTestSuite) TestEpochIdentifierAfterEpochEnd() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

utils "github.com/evmos/evmos/v15/utils"
incentivestypes "github.com/evmos/evmos/v15/x/incentives/types"
"github.com/evmos/evmos/v15/x/inflation/types"
"github.com/evmos/evmos/v15/x/inflation/v1/types"
)

// 200M token at year 4 allocated to the team
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
evmostypes "github.com/evmos/evmos/v15/types"
incentivestypes "github.com/evmos/evmos/v15/x/incentives/types"
"github.com/evmos/evmos/v15/x/inflation/types"
"github.com/evmos/evmos/v15/x/inflation/v1/types"
)

func (suite *KeeperTestSuite) TestMintAndAllocateInflation() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

epochstypes "github.com/evmos/evmos/v15/x/epochs/types"
incentivestypes & 341A quot;github.com/evmos/evmos/v15/x/incentives/types"
"github.com/evmos/evmos/v15/x/inflation/types"
"github.com/evmos/evmos/v15/x/inflation/v1/types"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/evmos/evmos/v15/x/inflation/types"
"github.com/evmos/evmos/v15/x/inflation/v1/types"
)

// Keeper of the inflation store
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ package keeper

import (
sdk "github.com/cosmos/cosmos-sdk/types"
v2 "github.com/evmos/evmos/v15/x/inflation/migrations/v2"
v3 "github.com/evmos/evmos/v15/x/inflation/migrations/v3"
"github.com/evmos/evmos/v15/x/inflation/types"
v2 "github.com/evmos/evmos/v15/x/inflation/v1/migrations/v2"
v3 "github.com/evmos/evmos/v15/x/inflation/v1/migrations/v3"
"github.com/evmos/evmos/v15/x/inflation/v1/types"
)

// Migrator is a struct for handling in-place store migrations.
Expand Down
Loading
0