unit test fixes after rebase

This commit is contained in:
rigel rozanski 2017-07-13 16:58:13 -04:00 committed by Ethan Frey
parent 463f2dca30
commit 7a37b9b9a9

View File

@ -8,6 +8,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
abci "github.com/tendermint/abci/types"
"github.com/tendermint/basecoin"
"github.com/tendermint/basecoin/modules/auth"
"github.com/tendermint/basecoin/modules/base"
@ -16,8 +17,6 @@ import (
"github.com/tendermint/basecoin/modules/nonce"
"github.com/tendermint/basecoin/stack"
"github.com/tendermint/basecoin/state"
abci "github.com/tendermint/abci/types"
wire "github.com/tendermint/go-wire"
eyes "github.com/tendermint/merkleeyes/client"
"github.com/tendermint/tmlibs/log"
@ -60,7 +59,7 @@ func (at *appTest) signTx(tx basecoin.Tx) basecoin.Tx {
func (at *appTest) getTx(coins coin.Coins) basecoin.Tx {
tx := at.baseTx(coins)
tx = base.NewChainTx(at.chainID, 0, tx)
tx = nonce.NewTx(tx, 0, []basecoin.Actor{at.acctIn.Actor()})
tx = nonce.NewTx(1, []basecoin.Actor{at.acctIn.Actor()}, tx)
return at.signTx(tx)
}
@ -68,6 +67,7 @@ func (at *appTest) feeTx(coins coin.Coins, toll coin.Coin) basecoin.Tx {
tx := at.baseTx(coins)
tx = fee.NewFee(tx, toll, at.acctIn.Actor())
tx = base.NewChainTx(at.chainID, 0, tx)
tx = nonce.NewTx(1, []basecoin.Actor{at.acctIn.Actor()}, tx)
return at.signTx(tx)
}