certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rebase fixes

This commit is contained in:
rigelrozanski 2018-03-23 17:15:41 +01:00
parent 59562cd864
commit 4e45d7368b
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
types/errors.go
View File

@ -108,9 +108,6 @@ func ErrInsufficientCoins(msg string) Error {
func ErrInvalidCoins(msg string) Error { func ErrInvalidCoins(msg string) Error {
return newError(CodeInvalidCoins, msg) return newError(CodeInvalidCoins, msg)
} }
func ErrInvalidCoins(coins Coins) Error {
return newError(CodeInvalidCoins, coins.String())
}
//---------------------------------------- //----------------------------------------
// Error & sdkError // Error & sdkError

2
x/stake/handler.go
View File

@ -64,7 +64,7 @@ func NewHandler(k Keeper, ck bank.CoinKeeper) sdk.Handler {
case MsgUnbond: case MsgUnbond:
return k.handleMsgUnbond(ctx, msg) return k.handleMsgUnbond(ctx, msg)
default: default:
return sdk.ErrTxParse("invalid message parse in staking module").Result() return sdk.ErrTxDecode("invalid message parse in staking module").Result()
} }
} }
} }

3
x/stake/keeper_test.go
View File

@ -47,14 +47,13 @@ func TestUpdateVotingPower(t *testing.T) {
// initialize some candidates into the state // initialize some candidates into the state
amts := []int64{400, 200, 100, 10, 1} amts := []int64{400, 200, 100, 10, 1}
candidates := make([]Candidate, 5) candidates := make([]Candidate, 5)
for i := 0; i < len(5); i++ { for i := 0; i < 5; i++ {
c := Candidate{ c := Candidate{
Status: Unbonded, Status: Unbonded,
PubKey: pks[i], PubKey: pks[i],
Address: addrs[i], Address: addrs[i],
Assets: sdk.NewRat(amts[i]), Assets: sdk.NewRat(amts[i]),
Liabilities: sdk.NewRat(amts[i]), Liabilities: sdk.NewRat(amts[i]),
VotingPower: sdk.NewRat(amts[i]),
} }
keeper.setCandidate(ctx, c) keeper.setCandidate(ctx, c)
candidate[i] = c candidate[i] = c

4
x/stake/msg.go
View File

@ -57,7 +57,7 @@ func (msg MsgDeclareCandidacy) ValidateBasic() sdk.Error {
return ErrCandidateEmpty() return ErrCandidateEmpty()
} }
if msg.Bond.Amount <= 0 { if msg.Bond.Amount <= 0 {
return sdk.ErrInvalidCoins(sdk.Coins{msg.Bond}) return sdk.ErrInvalidCoins(sdk.Coins{msg.Bond}.String())
} }
empty := Description{} empty := Description{}
if msg.Description == empty { if msg.Description == empty {
@ -153,7 +153,7 @@ func (msg MsgDelegate) ValidateBasic() sdk.Error {
return ErrBadCandidateAddr() return ErrBadCandidateAddr()
} }
if msg.Bond.Amount <= 0 { if msg.Bond.Amount <= 0 {
return sdk.ErrInvalidCoins(sdk.Coins{msg.Bond}) return sdk.ErrInvalidCoins(sdk.Coins{msg.Bond}.String())
} }
return nil return nil
} }