LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge PR #3621: module inter-dependency cleanup

Browse Source
This commit is contained in:
frog power 4000
2019-02-13 15:01:50 -08:00
committed by Jack Zampolin
parent dafe0acf4f
commit d66db6a772
75 changed files with 605 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x/slashing/handler_test.go
+3 -4
View File
@@ -8,14 +8,13 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/staking"
"github.com/cosmos/cosmos-sdk/x/staking/types"
)
func TestCannotUnjailUnlessJailed(t *testing.T) {
// initial setup
ctx, ck, sk, _, keeper := createTestInput(t, DefaultParams())
slh := NewHandler(keeper)
amt := types.TokensFromTendermintPower(100)
amt := sdk.TokensFromTendermintPower(100)
addr, val := addrs[0], pks[0]
msg := NewTestMsgCreateValidator(addr, val, amt)
got := staking.NewHandler(sk)(ctx, msg)
@@ -40,7 +39,7 @@ func TestCannotUnjailUnlessMeetMinSelfDelegation(t *testing.T) {
ctx, ck, sk, _, keeper := createTestInput(t, DefaultParams())
slh := NewHandler(keeper)
amtInt := int64(100)
addr, val, amt := addrs[0], pks[0], types.TokensFromTendermintPower(amtInt)
addr, val, amt := addrs[0], pks[0], sdk.TokensFromTendermintPower(amtInt)
msg := NewTestMsgCreateValidator(addr, val, amt)
msg.MinSelfDelegation = amt
got := staking.NewHandler(sk)(ctx, msg)
@@ -72,7 +71,7 @@ func TestJailedValidatorDelegations(t *testing.T) {
stakingKeeper.SetParams(ctx, stakingParams)
// create a validator
bondAmount := staking.TokensFromTendermintPower(10)
bondAmount := sdk.TokensFromTendermintPower(10)
valPubKey := pks[0]
valAddr, consAddr := addrs[1], sdk.ConsAddress(addrs[0])