Skip to content

Commit

Permalink
removing deps that are no longer needed (bp #781) (#782)
Browse files Browse the repository at this point in the history
* removing deps no longer needed (#781)

(cherry picked from commit 98f228d)

# Conflicts:
#	go.sum

* go mod tidy

Co-authored-by: Shahan Khatchadourian <shahan.k.code@gmail.com>
  • Loading branch information
mergify[bot] and shahankhatch committed Mar 22, 2021
1 parent ca15d27 commit aefa7ab
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 741 deletions.
25 changes: 0 additions & 25 deletions app/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ import (
"github.com/cosmos/cosmos-sdk/client/flags"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/version"
auth "github.com/cosmos/cosmos-sdk/x/auth/types"
bank "github.com/cosmos/cosmos-sdk/x/bank/types"
captypes "github.com/cosmos/cosmos-sdk/x/capability/types"
distr "github.com/cosmos/cosmos-sdk/x/distribution/types"
evtypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
"github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
"github.com/cosmos/cosmos-sdk/x/genutil/types"
Expand Down Expand Up @@ -107,29 +105,6 @@ $ %s migrate /path/to/genesis.json --chain-id=cosmoshub-4 --genesis-time=2019-04
// TODO: handler error from migrationFunc call
newGenState = migrationFunc(newGenState, clientCtx)

noProp29, _ := cmd.Flags().GetBool(flagNoProp29)

if !noProp29 {

var bankGenesis bank.GenesisState

clientCtx.JSONMarshaler.MustUnmarshalJSON(newGenState[bank.ModuleName], &bankGenesis)

var distrGenesis distr.GenesisState

clientCtx.JSONMarshaler.MustUnmarshalJSON(newGenState[distr.ModuleName], &distrGenesis)

var authGenesis auth.GenesisState
clientCtx.JSONMarshaler.MustUnmarshalJSON(newGenState[auth.ModuleName], &authGenesis)

authGenesis, bankGenesis, distrGenesis = Prop29Migration(&authGenesis, &bankGenesis, &distrGenesis)

newGenState[bank.ModuleName] = clientCtx.JSONMarshaler.MustMarshalJSON(&bankGenesis)
newGenState[distr.ModuleName] = clientCtx.JSONMarshaler.MustMarshalJSON(&distrGenesis)
newGenState[auth.ModuleName] = clientCtx.JSONMarshaler.MustMarshalJSON(&authGenesis)

}

var bankGenesis bank.GenesisState

clientCtx.JSONMarshaler.MustUnmarshalJSON(newGenState[bank.ModuleName], &bankGenesis)
Expand Down
Loading

0 comments on commit aefa7ab

Please sign in to comment.