Skip to content

Commit

Permalink
Semantic versioning for osmosis v4.x (#780)
Browse files Browse the repository at this point in the history
* Semantic versioning.

github.com/marwan-at-work/mod

* Update cli_test.go

* Fix cli test

* Register error 69420 for the epoch module

* I think this is correct, but am not certain.  Found an old import, and updated the go module paths in the .proto files

* Delete .gitpod.yml

* fixing

* v4.x

* fixes for v4 semver

* use keyed fields in composite literals in store/legacy/v101/tree.go
  • Loading branch information
faddat authored Jan 28, 2022
1 parent 69ec73c commit c50909b
Show file tree
Hide file tree
Showing 267 changed files with 8,043 additions and 1,466 deletions.
4 changes: 2 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ run:
linters:
disable-all: true
enable:
- errcheck
# - errcheck
- gofmt
# - goimports
# - golint
- maligned
- govet

issues:
exclude-rules:
Expand Down
48 changes: 24 additions & 24 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,30 +73,30 @@ import (
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/gorilla/mux"
appparams "github.com/osmosis-labs/osmosis/app/params"
_ "github.com/osmosis-labs/osmosis/client/docs/statik"
"github.com/osmosis-labs/osmosis/x/claim"
claimkeeper "github.com/osmosis-labs/osmosis/x/claim/keeper"
claimtypes "github.com/osmosis-labs/osmosis/x/claim/types"
"github.com/osmosis-labs/osmosis/x/epochs"
epochskeeper "github.com/osmosis-labs/osmosis/x/epochs/keeper"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
"github.com/osmosis-labs/osmosis/x/gamm"
gammkeeper "github.com/osmosis-labs/osmosis/x/gamm/keeper"
gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types"
"github.com/osmosis-labs/osmosis/x/incentives"
incentiveskeeper "github.com/osmosis-labs/osmosis/x/incentives/keeper"
incentivestypes "github.com/osmosis-labs/osmosis/x/incentives/types"
"github.com/osmosis-labs/osmosis/x/lockup"
lockupkeeper "github.com/osmosis-labs/osmosis/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types"
"github.com/osmosis-labs/osmosis/x/mint"
mintkeeper "github.com/osmosis-labs/osmosis/x/mint/keeper"
minttypes "github.com/osmosis-labs/osmosis/x/mint/types"
poolincentives "github.com/osmosis-labs/osmosis/x/pool-incentives"
poolincentivesclient "github.com/osmosis-labs/osmosis/x/pool-incentives/client"
poolincentiveskeeper "github.com/osmosis-labs/osmosis/x/pool-incentives/keeper"
poolincentivestypes "github.com/osmosis-labs/osmosis/x/pool-incentives/types"
appparams "github.com/osmosis-labs/osmosis/v4/app/params"
_ "github.com/osmosis-labs/osmosis/v4/client/docs/statik"
"github.com/osmosis-labs/osmosis/v4/x/claim"
claimkeeper "github.com/osmosis-labs/osmosis/v4/x/claim/keeper"
claimtypes "github.com/osmosis-labs/osmosis/v4/x/claim/types"
"github.com/osmosis-labs/osmosis/v4/x/epochs"
epochskeeper "github.com/osmosis-labs/osmosis/v4/x/epochs/keeper"
epochstypes "github.com/osmosis-labs/osmosis/v4/x/epochs/types"
"github.com/osmosis-labs/osmosis/v4/x/gamm"
gammkeeper "github.com/osmosis-labs/osmosis/v4/x/gamm/keeper"
gammtypes "github.com/osmosis-labs/osmosis/v4/x/gamm/types"
"github.com/osmosis-labs/osmosis/v4/x/incentives"
incentiveskeeper "github.com/osmosis-labs/osmosis/v4/x/incentives/keeper"
incentivestypes "github.com/osmosis-labs/osmosis/v4/x/incentives/types"
"github.com/osmosis-labs/osmosis/v4/x/lockup"
lockupkeeper "github.com/osmosis-labs/osmosis/v4/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/v4/x/lockup/types"
"github.com/osmosis-labs/osmosis/v4/x/mint"
mintkeeper "github.com/osmosis-labs/osmosis/v4/x/mint/keeper"
minttypes "github.com/osmosis-labs/osmosis/v4/x/mint/types"
poolincentives "github.com/osmosis-labs/osmosis/v4/x/pool-incentives"
poolincentivesclient "github.com/osmosis-labs/osmosis/v4/x/pool-incentives/client"
poolincentiveskeeper "github.com/osmosis-labs/osmosis/v4/x/pool-incentives/keeper"
poolincentivestypes "github.com/osmosis-labs/osmosis/v4/x/pool-incentives/types"
"github.com/rakyll/statik/fs"
"github.com/spf13/cast"
abci "github.com/tendermint/tendermint/abci/types"
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/osmosis-labs/osmosis/app/params"
"github.com/osmosis-labs/osmosis/v4/app/params"
)

// MakeEncodingConfig creates an EncodingConfig for testing
Expand Down
2 changes: 1 addition & 1 deletion app/params/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package params
import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/osmosis-labs/osmosis/v043_temp/address"
"github.com/osmosis-labs/osmosis/v4/v043_temp/address"
)

const (
Expand Down
1 change: 1 addition & 0 deletions app/params/proto.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !test_amino
// +build !test_amino

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

sdk "github.com/cosmos/cosmos-sdk/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/osmosis-labs/osmosis/app"
"github.com/osmosis-labs/osmosis/v4/app"
"github.com/stretchr/testify/suite"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
)
Expand Down
8 changes: 4 additions & 4 deletions cmd/osmosisd/cmd/balances_from_state_export.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
appparams "github.com/osmosis-labs/osmosis/app/params"
claimtypes "github.com/osmosis-labs/osmosis/x/claim/types"
gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types"
lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types"
appparams "github.com/osmosis-labs/osmosis/v4/app/params"
claimtypes "github.com/osmosis-labs/osmosis/v4/x/claim/types"
gammtypes "github.com/osmosis-labs/osmosis/v4/x/gamm/types"
lockuptypes "github.com/osmosis-labs/osmosis/v4/x/lockup/types"
"github.com/spf13/cobra"
tmjson "github.com/tendermint/tendermint/libs/json"
tmtypes "github.com/tendermint/tendermint/types"
Expand Down
4 changes: 2 additions & 2 deletions cmd/osmosisd/cmd/genaccounts.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/cosmos/cosmos-sdk/x/genutil"
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
appparams "github.com/osmosis-labs/osmosis/app/params"
claimtypes "github.com/osmosis-labs/osmosis/x/claim/types"
appparams "github.com/osmosis-labs/osmosis/v4/app/params"
claimtypes "github.com/osmosis-labs/osmosis/v4/x/claim/types"
)

const (
Expand Down
12 changes: 6 additions & 6 deletions cmd/osmosisd/cmd/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ import (
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

appParams "github.com/osmosis-labs/osmosis/app/params"
appParams "github.com/osmosis-labs/osmosis/v4/app/params"

claimtypes "github.com/osmosis-labs/osmosis/x/claim/types"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
incentivestypes "github.com/osmosis-labs/osmosis/x/incentives/types"
minttypes "github.com/osmosis-labs/osmosis/x/mint/types"
poolincentivestypes "github.com/osmosis-labs/osmosis/x/pool-incentives/types"
claimtypes "github.com/osmosis-labs/osmosis/v4/x/claim/types"
epochstypes "github.com/osmosis-labs/osmosis/v4/x/epochs/types"
incentivestypes "github.com/osmosis-labs/osmosis/v4/x/incentives/types"
minttypes "github.com/osmosis-labs/osmosis/v4/x/mint/types"
poolincentivestypes "github.com/osmosis-labs/osmosis/v4/x/pool-incentives/types"
)

func PrepareGenesisCmd(defaultNodeHome string, mbm module.BasicManager) *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions cmd/osmosisd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"

"github.com/cosmos/cosmos-sdk/x/crisis"
"github.com/osmosis-labs/osmosis/app/params"
"github.com/osmosis-labs/osmosis/v4/app/params"

"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
Expand All @@ -34,7 +34,7 @@ import (
"github.com/tendermint/tendermint/libs/log"
dbm "github.com/tendermint/tm-db"

osmosis "github.com/osmosis-labs/osmosis/app"
osmosis "github.com/osmosis-labs/osmosis/v4/app"
)

// NewRootCmd creates a new root command for simd. It is called once in the
Expand Down
4 changes: 2 additions & 2 deletions cmd/osmosisd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package main
import (
"os"

"github.com/osmosis-labs/osmosis/app/params"
"github.com/osmosis-labs/osmosis/cmd/osmosisd/cmd"
"github.com/osmosis-labs/osmosis/v4/app/params"
"github.com/osmosis-labs/osmosis/v4/cmd/osmosisd/cmd"
)

func main() {
Expand Down
Loading

0 comments on commit c50909b

Please sign in to comment.