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

Fix tests

This commit is contained in:
Jae Kwon 2017-01-12 14:46:18 -08:00
parent 88fd1b752e
commit 623ef17a84
1 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tests/tmsp/main.go
View File

@ -7,6 +7,7 @@ import (
"github.com/tendermint/basecoin/tests" "github.com/tendermint/basecoin/tests"
"github.com/tendermint/basecoin/types" "github.com/tendermint/basecoin/types"
. "github.com/tendermint/go-common" . "github.com/tendermint/go-common"
"github.com/tendermint/go-crypto"
"github.com/tendermint/go-wire" "github.com/tendermint/go-wire"
eyescli "github.com/tendermint/merkleeyes/client" eyescli "github.com/tendermint/merkleeyes/client"
) )
@ -41,12 +42,7 @@ func testSendTx() {
Fee: 0, Fee: 0,
Gas: 0, Gas: 0,
Inputs: []types.TxInput{ Inputs: []types.TxInput{
types.TxInput{ makeInput(test1PrivAcc.Account.PubKey, types.Coins{{"", 1}}, 1),
Address: test1PrivAcc.Account.PubKey.Address(),
PubKey: test1PrivAcc.Account.PubKey, // TODO is this needed?
Coins: types.Coins{{"", 1}},
Sequence: 1,
},
}, },
Outputs: []types.TxOutput{ Outputs: []types.TxOutput{
types.TxOutput{ types.TxOutput{
@ -100,26 +96,12 @@ func testSequence() {
for i := 0; i < len(privAccounts); i++ { for i := 0; i < len(privAccounts); i++ {
privAccount := privAccounts[i] privAccount := privAccounts[i]
//Generate txInputs with or without public key
tempTxInputs := types.TxInput{
Address: test1Acc.PubKey.Address(),
PubKey: test1Acc.PubKey, // TODO is this needed?
Coins: types.Coins{{"", 1000002}},
Sequence: sequence,
}
if sequence > 1 {
tempTxInputs = types.TxInput{
Address: test1Acc.PubKey.Address(),
Coins: types.Coins{{"", 1000002}},
Sequence: sequence,
}
}
tx := &types.SendTx{ tx := &types.SendTx{
Fee: 2, Fee: 2,
Gas: 2, Gas: 2,
Inputs: []types.TxInput{tempTxInputs}, Inputs: []types.TxInput{
makeInput(test1Acc.PubKey, types.Coins{{"", 1000002}}, sequence),
},
Outputs: []types.TxOutput{ Outputs: []types.TxOutput{
types.TxOutput{ types.TxOutput{
Address: privAccount.Account.PubKey.Address(), Address: privAccount.Account.PubKey.Address(),
@ -168,12 +150,7 @@ func testSequence() {
Fee: 2, Fee: 2,
Gas: 2, Gas: 2,
Inputs: []types.TxInput{ Inputs: []types.TxInput{
types.TxInput{ makeInput(privAccountA.Account.PubKey, types.Coins{{"", 3}}, privAccountASequence+1),
Address: privAccountA.Account.PubKey.Address(),
PubKey: privAccountA.Account.PubKey,
Coins: types.Coins{{"", 3}},
Sequence: privAccountASequence + 1,
},
}, },
Outputs: []types.TxOutput{ Outputs: []types.TxOutput{
types.TxOutput{ types.TxOutput{
@ -197,3 +174,16 @@ func testSequence() {
} }
} }
} }
func makeInput(pubKey crypto.PubKey, coins types.Coins, sequence int) types.TxInput {
input := types.TxInput{
Address: pubKey.Address(),
PubKey: pubKey,
Coins: coins,
Sequence: sequence,
}
if sequence > 1 {
input.PubKey = nil
}
return input
}