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

everything but IBC

Browse Source
This commit is contained in:
Sunny Aggarwal 2018-03-25 00:27:23 +01:00
parent 131289ce70
commit 884b827730
4 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
x/bank/keeper.go
View File

@ -1,8 +1,6 @@
package bank
import (
"fmt"
sdk "github.com/cosmos/cosmos-sdk/types"
)
@ -25,13 +23,15 @@ func (ck CoinKeeper) SubtractCoins(ctx sdk.Context, addr sdk.Address, amt sdk.Co
return amt, sdk.ErrUnknownAddress(addr.String())
}
coins := acc.GetCoins()
newCoins := coins.Minus(amt)
if !newCoins.IsNotNegative() {
return amt, sdk.ErrInsufficientCoins(fmt.Sprintf("%s < %s", coins, amt))
}
// coins := acc.GetCoins()
// newCoins := coins.Minus(amt)
// if !newCoins.IsNotNegative() {
// return amt, sdk.ErrInsufficientCoins(fmt.Sprintf("%s < %s", coins, amt))
// }
acc.SetCoins(newCoins)
newCoins := sdk.Coins{}
// acc.SetCoins(newCoins)
ck.am.SetAccount(ctx, acc)
return newCoins, nil
}

13
x/staking/handler.go
View File

@ -18,7 +18,7 @@ func (k Keeper) Handler(ctx sdk.Context, msg sdk.Msg) sdk.Result {
}
func handleBondMsg(ctx sdk.Context, k Keeper, msg BondMsg) sdk.Result {
_, err := k.Bond(ctx, msg.Address, msg.Stake)
power, err := k.Bond(ctx, msg.Address, msg.PubKey, msg.Stake)
if err != nil {
return err.Result()
}
@ -35,16 +35,7 @@ func handleBondMsg(ctx sdk.Context, k Keeper, msg BondMsg) sdk.Result {
}
func handleUnbondMsg(ctx sdk.Context, k Keeper, msg UnbondMsg) sdk.Result {
pubKey, power, err := k.Unbond(ctx, msg.Address)
if err != nil {
return err.Result()
}
stake := sdk.Coin{
Denom: "mycoin",
Amount: power,
}
_, err = k.ck.AddCoins(ctx, msg.Address, sdk.Coins{stake})
pubKey, _, err := k.Unbond(ctx, msg.Address)
if err != nil {
return err.Result()
}

8
x/staking/keeper.go
View File

@ -84,5 +84,13 @@ func (k Keeper) Unbond(ctx sdk.Context, addr sdk.Address) (crypto.PubKey, int64,
return crypto.PubKey{}, 0, ErrInvalidUnbond()
}
k.deleteBondInfo(ctx, addr)
returnedBond := sdk.Coin{stakingToken, bi.Power}
_, err := k.ck.AddCoins(ctx, addr, []sdk.Coin{returnedBond})
if err != nil {
return bi.PubKey, bi.Power, err
}
return bi.PubKey, bi.Power, nil
}

20
x/staking/keeper_test.go
View File

@ -13,20 +13,23 @@ import (
"github.com/cosmos/cosmos-sdk/store"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth"
"github.com/cosmos/cosmos-sdk/x/bank"
)
func setupMultiStore() (sdk.MultiStore, *sdk.KVStoreKey) {
func setupMultiStore() (sdk.MultiStore, *sdk.KVStoreKey, *sdk.KVStoreKey) {
db := dbm.NewMemDB()
authKey := sdk.NewKVStoreKey("authkey")
capKey := sdk.NewKVStoreKey("capkey")
ms := store.NewCommitMultiStore(db)
ms.MountStoreWithDB(capKey, sdk.StoreTypeIAVL, db)
ms.MountStoreWithDB(authKey, sdk.StoreTypeIAVL, db)
ms.LoadLatestVersion()
return ms, capKey
return ms, authKey, capKey
}
func TestKeeperGetSet(t *testing.T) {
ms, capKey := setupMultiStore()
ms, _, capKey := setupMultiStore()
ctx := sdk.NewContext(ms, abci.Header{}, false, nil)
stakeKeeper := NewKeeper(capKey, bank.NewCoinKeeper(nil))
@ -51,10 +54,13 @@ func TestKeeperGetSet(t *testing.T) {
}
func TestBonding(t *testing.T) {
ms, capKey := setupMultiStore()
ms, authKey, capKey := setupMultiStore()
ctx := sdk.NewContext(ms, abci.Header{}, false, nil)
stakeKeeper := NewKeeper(capKey, bank.NewCoinKeeper(nil))
accountMapper := auth.NewAccountMapper(authKey, &auth.BaseAccount{})
coinKeeper := bank.NewCoinKeeper(accountMapper)
stakeKeeper := NewKeeper(capKey, coinKeeper)
addr := sdk.Address([]byte("some-address"))
privKey := crypto.GenPrivKeyEd25519()
pubKey := privKey.PubKey()
@ -62,10 +68,10 @@ func TestBonding(t *testing.T) {
_, _, err := stakeKeeper.Unbond(ctx, addr)
assert.Equal(t, err, ErrInvalidUnbond())
_, err = stakeKeeper.Bond(ctx, addr, pubKey, 10)
_, err = stakeKeeper.Bond(ctx, addr, pubKey, sdk.Coin{"steak", 10})
assert.Nil(t, err)
power, err := stakeKeeper.Bond(ctx, addr, pubKey, 10)
power, err := stakeKeeper.Bond(ctx, addr, pubKey, sdk.Coin{"steak", 10})
assert.Equal(t, int64(20), power)
pk, _, err := stakeKeeper.Unbond(ctx, addr)