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

Semantic versioning for osmosis v4.x #780

Merged
merged 12 commits into from
Jan 28, 2022
Merged

Semantic versioning for osmosis v4.x #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d6ed86d
Semantic versioning.
faddat Nov 29, 2021
78fa9c9
Update cli_test.go
ValarDragon Dec 1, 2021
32a59ce
Fix cli test
faddat Dec 4, 2021
2e995a7
Register error 69420 for the epoch module
faddat Dec 10, 2021
b70ef2f
I think this is correct, but am not certain. Found an old import, an…
faddat Jan 23, 2022
75d5841
Delete .gitpod.yml
faddat Jan 23, 2022
0fddaac
Merge branch 'v4.x' into faddat/semverfix
faddat Jan 24, 2022
2045a85
fixing
faddat Jan 27, 2022
ef728cb
Merge branch 'faddat/semverfix' of https://github.com/notional-labs/o…
faddat Jan 27, 2022
f3095d8
v4.x
faddat Jan 27, 2022
21e0605
fixes for v4 semver
faddat Jan 27, 2022
c3aaea0
use keyed fields in composite literals in store/legacy/v101/tree.go
faddat Jan 27, 2022
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 .golangci.yml
View file
Open in desktop
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
mattverse marked this conversation as resolved.
Show resolved Hide resolved

issues:
exclude-rules:
Expand Down
48 changes: 24 additions & 24 deletions app/app.go
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !test_amino
// +build !test_amino
faddat marked this conversation as resolved.
Show resolved Hide resolved

package params
Expand Down
2 changes: 1 addition & 1 deletion app/upgrade_test.go
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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