Skip to content

Commit

Permalink
fix: remove dependency on tendermint internal library (#12368) (#12378)
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Jun 28, 2022
1 parent f0bf4c3 commit d5fa0a7
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
8 changes: 6 additions & 2 deletions store/types/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"io"

abci "github.com/tendermint/tendermint/abci/types"
tmstrings "github.com/tendermint/tendermint/libs/strings"
dbm "github.com/tendermint/tm-db"

pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types"
Expand Down Expand Up @@ -64,7 +63,12 @@ func (s *StoreUpgrades) IsAdded(key string) bool {
if s == nil {
return false
}
return tmstrings.StringInSlice(key, s.Added)
for _, added := range s.Added {
if key == added {
return true
}
}
return false
}

// IsDeleted returns true if the given key should be deleted
Expand Down
11 changes: 9 additions & 2 deletions x/staking/keeper/msg_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"google.golang.org/grpc/status"

"github.com/armon/go-metrics"
tmstrings "github.com/tendermint/tendermint/libs/strings"

cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
"github.com/cosmos/cosmos-sdk/telemetry"
Expand Down Expand Up @@ -70,7 +69,15 @@ func (k msgServer) CreateValidator(goCtx context.Context, msg *types.MsgCreateVa

cp := ctx.ConsensusParams()
if cp != nil && cp.Validator != nil {
if !tmstrings.StringInSlice(pk.Type(), cp.Validator.PubKeyTypes) {
pkType := pk.Type()
hasKeyType := false
for _, keyType := range cp.Validator.PubKeyTypes {
if pkType == keyType {
hasKeyType = true
break
}
}
if !hasKeyType {
return nil, sdkerrors.Wrapf(
types.ErrValidatorPubKeyTypeNotSupported,
"got: %s, expected: %s", pk.Type(), cp.Validator.PubKeyTypes,
Expand Down

0 comments on commit d5fa0a7

Please sign in to comment.