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

fixes, remove assert with Sprintf

This commit is contained in:
rigel rozanski 2017-04-17 19:53:06 -04:00
parent e6ec782f0c
commit e36a40c603
5 changed files with 58 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/app_test.go
View File

@ -136,23 +136,25 @@ func TestTx(t *testing.T) {
at.accIn.Balance = types.Coins{{"mycoin", 2}} at.accIn.Balance = types.Coins{{"mycoin", 2}}
at.acc2app(at.accIn.Account) at.acc2app(at.accIn.Account)
res, _, _, _, _ := at.exec(at.getTx(1), true) res, _, _, _, _ := at.exec(at.getTx(1), true)
assert.True(res.IsErr(), fmt.Sprintf("ExecTx/Bad CheckTx: Expected error return from ExecTx, returned: %v", res)) assert.True(res.IsErr(), "ExecTx/Bad CheckTx: Expected error return from ExecTx, returned: %v", res)
res, inGot, inExp, outGot, outExp := at.exec(at.getTx(1), false) res, inGot, inExp, outGot, outExp := at.exec(at.getTx(1), false)
assert.True(res.IsErr(), fmt.Sprintf("ExecTx/Bad DeliverTx: Expected error return from ExecTx, returned: %v", res)) assert.True(res.IsErr(), "ExecTx/Bad DeliverTx: Expected error return from ExecTx, returned: %v", res)
assert.False(inGot.IsEqual(inExp), fmt.Sprintf("ExecTx/Bad DeliverTx: shouldn't be equal, inGot: %v, inExp: %v", inGot, inExp)) assert.False(inGot.IsEqual(inExp), "ExecTx/Bad DeliverTx: shouldn't be equal, inGot: %v, inExp: %v", inGot, inExp)
assert.False(outGot.IsEqual(outExp), fmt.Sprintf("ExecTx/Bad DeliverTx: shouldn't be equal, outGot: %v, outExp: %v", outGot, outExp)) assert.False(outGot.IsEqual(outExp), "ExecTx/Bad DeliverTx: shouldn't be equal, outGot: %v, outExp: %v", outGot, outExp)
//Regular CheckTx //Regular CheckTx
at.reset() at.reset()
res, _, _, _, _ = at.exec(at.getTx(1), true) res, _, _, _, _ = at.exec(at.getTx(1), true)
assert.True(res.IsOK(), fmt.Sprintf("ExecTx/Good CheckTx: Expected OK return from ExecTx, Error: %v", res)) assert.True(res.IsOK(), "ExecTx/Good CheckTx: Expected OK return from ExecTx, Error: %v", res)
//Regular DeliverTx //Regular DeliverTx
at.reset() at.reset()
res, inGot, inExp, outGot, outExp = at.exec(at.getTx(1), false) res, inGot, inExp, outGot, outExp = at.exec(at.getTx(1), false)
assert.True(res.IsOK(), fmt.Sprintf("ExecTx/Good DeliverTx: Expected OK return from ExecTx, Error: %v", res)) assert.True(res.IsOK(), "ExecTx/Good DeliverTx: Expected OK return from ExecTx, Error: %v", res)
assert.True(inGot.IsEqual(inExp), fmt.Sprintf("ExecTx/good DeliverTx: unexpected change in input coins, inGot: %v, inExp: %v", inGot, inExp)) assert.True(inGot.IsEqual(inExp),
assert.True(outGot.IsEqual(outExp), fmt.Sprintf("ExecTx/good DeliverTx: unexpected change in output coins, outGot: %v, outExp: %v", outGot, outExp)) "ExecTx/good DeliverTx: unexpected change in input coins, inGot: %v, inExp: %v", inGot, inExp)
assert.True(outGot.IsEqual(outExp),
"ExecTx/good DeliverTx: unexpected change in output coins, outGot: %v, outExp: %v", outGot, outExp)
} }
func TestQuery(t *testing.T) { func TestQuery(t *testing.T) {
@ -160,7 +162,7 @@ func TestQuery(t *testing.T) {
at := newAppTest(t) at := newAppTest(t)
res, _, _, _, _ := at.exec(at.getTx(1), false) res, _, _, _, _ := at.exec(at.getTx(1), false)
assert.True(res.IsOK(), fmt.Sprintf("Commit, DeliverTx: Expected OK return from DeliverTx, Error: %v", res)) assert.True(res.IsOK(), "Commit, DeliverTx: Expected OK return from DeliverTx, Error: %v", res)
resQueryPreCommit := at.app.Query(abci.RequestQuery{ resQueryPreCommit := at.app.Query(abci.RequestQuery{
Path: "/account", Path: "/account",

75
state/execution_test.go
View File

@ -1,7 +1,6 @@
package state package state
import ( import (
"fmt"
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -34,8 +33,8 @@ func (et *execTest) signTx(tx *types.SendTx, accsIn ...types.PrivAccount) {
} }
// make tx from accsIn to et.accOut // make tx from accsIn to et.accOut
func (et *execTest) getTx(seq int, accsIn ...types.PrivAccount) *types.SendTx { func (et *execTest) getTx(seq int, accOut types.PrivAccount, accsIn ...types.PrivAccount) *types.SendTx {
return types.GetTx(seq, et.accOut, accsIn...) return types.GetTx(seq, accOut, accsIn...)
} }
// returns the final balance and expected balance for input and output accounts // returns the final balance and expected balance for input and output accounts
@ -140,7 +139,7 @@ func TestValidateInputsBasic(t *testing.T) {
//validate input basic //validate input basic
txs := types.Accs2TxInputs(1, et.accIn) txs := types.Accs2TxInputs(1, et.accIn)
res := validateInputsBasic(txs) res := validateInputsBasic(txs)
assert.True(res.IsOK(), fmt.Sprintf("validateInputsBasic: expected no error on good tx input. Error: %v", res.Error())) assert.True(res.IsOK(), "validateInputsBasic: expected no error on good tx input. Error: %v", res.Error())
txs[0].Coins[0].Amount = 0 txs[0].Coins[0].Amount = 0
res = validateInputsBasic(txs) res = validateInputsBasic(txs)
@ -152,12 +151,17 @@ func TestValidateInputsAdvanced(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
et := newExecTest() et := newExecTest()
//validate inputs advanced //create three temp accounts for the test
txs := et.getTx(1, et.accIn, et.accOut) accIn1 := types.MakeAcc("foox")
accIn2 := types.MakeAcc("fooy")
accIn3 := types.MakeAcc("fooz")
et.acc2State(et.accIn, et.accOut) //validate inputs advanced
txs := et.getTx(1, et.accOut, accIn1, accIn2, accIn3)
et.acc2State(accIn1, accIn2, accIn3, et.accOut)
accMap, res := getInputs(et.state, txs.Inputs) accMap, res := getInputs(et.state, txs.Inputs)
assert.True(res.IsOK(), fmt.Sprintf("validateInputsAdvanced: error retrieving accMap. Error: %v", res.Error())) assert.True(res.IsOK(), "validateInputsAdvanced: error retrieving accMap. Error: %v", res.Error())
signBytes := txs.SignBytes(et.chainID) signBytes := txs.SignBytes(et.chainID)
//test bad case, unsigned //test bad case, unsigned
@ -165,10 +169,15 @@ func TestValidateInputsAdvanced(t *testing.T) {
assert.True(res.IsErr(), "validateInputsAdvanced: expected an error on an unsigned tx input") assert.True(res.IsErr(), "validateInputsAdvanced: expected an error on an unsigned tx input")
//test good case sgined //test good case sgined
et.signTx(txs, et.accIn, et.accOut) et.signTx(txs, accIn1, accIn2, accIn3, et.accOut)
totalCoins, res = validateInputsAdvanced(accMap, signBytes, txs.Inputs) totalCoins, res = validateInputsAdvanced(accMap, signBytes, txs.Inputs)
assert.True(res.IsOK(), fmt.Sprintf("validateInputsAdvanced: expected no error on good tx input. Error: %v", res.Error())) assert.True(res.IsOK(), "validateInputsAdvanced: expected no error on good tx input. Error: %v", res.Error())
assert.True(totalCoins.IsEqual(txs.Inputs[0].Coins.Plus(txs.Inputs[1].Coins)), "ValidateInputsAdvanced: transaction total coins are not equal")
txsTotalCoins := txs.Inputs[0].Coins.Plus(txs.Inputs[1].Coins)
txsTotalCoins = txsTotalCoins.Plus(txs.Inputs[2].Coins)
assert.True(totalCoins.IsEqual(txsTotalCoins),
"ValidateInputsAdvanced: transaction total coins are not equal: got %v, expected %v", txsTotalCoins, totalCoins)
} }
func TestValidateInputAdvanced(t *testing.T) { func TestValidateInputAdvanced(t *testing.T) {
@ -176,7 +185,7 @@ func TestValidateInputAdvanced(t *testing.T) {
et := newExecTest() et := newExecTest()
//validate input advanced //validate input advanced
txs := et.getTx(1, et.accIn, et.accOut) txs := et.getTx(1, et.accOut, et.accIn)
et.acc2State(et.accIn, et.accOut) et.acc2State(et.accIn, et.accOut)
signBytes := txs.SignBytes(et.chainID) signBytes := txs.SignBytes(et.chainID)
@ -188,20 +197,21 @@ func TestValidateInputAdvanced(t *testing.T) {
//good signed case //good signed case
et.signTx(txs, et.accIn, et.accOut) et.signTx(txs, et.accIn, et.accOut)
res = validateInputAdvanced(&et.accIn.Account, signBytes, txs.Inputs[0]) res = validateInputAdvanced(&et.accIn.Account, signBytes, txs.Inputs[0])
assert.True(res.IsOK(), fmt.Sprintf("validateInputAdvanced: expected no error on good tx input. Error: %v", res.Error())) assert.True(res.IsOK(), "validateInputAdvanced: expected no error on good tx input. Error: %v", res.Error())
//bad sequence case //bad sequence case
et.accIn.Sequence = 2 et.accIn.Sequence = 1
et.signTx(txs, et.accIn, et.accOut) et.signTx(txs, et.accIn, et.accOut)
res = validateInputAdvanced(&et.accIn.Account, signBytes, txs.Inputs[0]) res = validateInputAdvanced(&et.accIn.Account, signBytes, txs.Inputs[0])
assert.True(res.IsErr(), "validateInputAdvanced: expected error on tx input with bad sequence") assert.Equal(abci.CodeType_BaseInvalidSequence, res.Code, "validateInputAdvanced: expected error on tx input with bad sequence")
et.accIn.Sequence = 1 //restore sequence et.accIn.Sequence = 0 //restore sequence
//bad balance case //bad balance case
et.accOut.Balance = types.Coins{{"mycoin", 2}} et.accIn.Balance = types.Coins{{"mycoin", 2}}
et.signTx(txs, et.accIn, et.accOut) et.signTx(txs, et.accIn, et.accOut)
res = validateInputAdvanced(&et.accIn.Account, signBytes, txs.Inputs[0]) res = validateInputAdvanced(&et.accIn.Account, signBytes, txs.Inputs[0])
assert.True(res.IsErr(), "validateInputAdvanced: expected error on tx input with insufficient funds") assert.Equal(abci.CodeType_BaseInsufficientFunds, res.Code,
"validateInputAdvanced: expected error on tx input with insufficient funds %v", et.accIn.Sequence)
} }
func TestValidateOutputsAdvanced(t *testing.T) { func TestValidateOutputsAdvanced(t *testing.T) {
@ -211,11 +221,11 @@ func TestValidateOutputsAdvanced(t *testing.T) {
//validateOutputsBasic //validateOutputsBasic
txs := types.Accs2TxOutputs(et.accIn) txs := types.Accs2TxOutputs(et.accIn)
res := validateOutputsBasic(txs) res := validateOutputsBasic(txs)
assert.True(res.IsOK(), fmt.Sprintf("validateOutputsBasic: expected no error on good tx output. Error: %v", res.Error())) assert.True(res.IsOK(), "validateOutputsBasic: expected no error on good tx output. Error: %v", res.Error())
txs[0].Coins[0].Amount = 0 txs[0].Coins[0].Amount = 0
res = validateOutputsBasic(txs) res = validateOutputsBasic(txs)
assert.True(res.IsErr(), fmt.Sprintf("validateInputBasic: expected error on bad tx output. Error: %v", res.Error())) assert.True(res.IsErr(), "validateInputBasic: expected error on bad tx output. Error: %v", res.Error())
} }
func TestSumOutput(t *testing.T) { func TestSumOutput(t *testing.T) {
@ -252,9 +262,9 @@ func TestAdjustBy(t *testing.T) {
incrBalOut := endBalOut.Minus(initBalOut) incrBalOut := endBalOut.Minus(initBalOut)
assert.True(decrBalIn.IsEqual(txIn[0].Coins), assert.True(decrBalIn.IsEqual(txIn[0].Coins),
fmt.Sprintf("adjustByInputs: total coins are not equal. diff: %v, tx: %v", decrBalIn.String(), txIn[0].Coins.String())) "adjustByInputs: total coins are not equal. diff: %v, tx: %v", decrBalIn.String(), txIn[0].Coins.String())
assert.True(incrBalOut.IsEqual(txOut[0].Coins), assert.True(incrBalOut.IsEqual(txOut[0].Coins),
fmt.Sprintf("adjustByInputs: total coins are not equal. diff: %v, tx: %v", incrBalOut.String(), txOut[0].Coins.String())) "adjustByInputs: total coins are not equal. diff: %v, tx: %v", incrBalOut.String(), txOut[0].Coins.String())
} }
@ -263,7 +273,7 @@ func TestExecTx(t *testing.T) {
et := newExecTest() et := newExecTest()
//ExecTx //ExecTx
txs := et.getTx(1, et.accIn) txs := et.getTx(1, et.accOut, et.accIn)
et.acc2State(et.accIn) et.acc2State(et.accIn)
et.acc2State(et.accOut) et.acc2State(et.accOut)
et.signTx(txs, et.accIn) et.signTx(txs, et.accIn)
@ -272,33 +282,30 @@ func TestExecTx(t *testing.T) {
et.accIn.Balance = types.Coins{{"mycoin", 2}} et.accIn.Balance = types.Coins{{"mycoin", 2}}
et.acc2State(et.accIn) et.acc2State(et.accIn)
res, _, _, _, _ := et.exec(txs, true) res, _, _, _, _ := et.exec(txs, true)
assert.True(res.IsErr(), assert.True(res.IsErr(), "ExecTx/Bad CheckTx: Expected error return from ExecTx, returned: %v", res)
fmt.Sprintf("ExecTx/Bad CheckTx: Expected error return from ExecTx, returned: %v", res))
res, balIn, balInExp, balOut, balOutExp := et.exec(txs, false) res, balIn, balInExp, balOut, balOutExp := et.exec(txs, false)
assert.True(res.IsErr(), assert.True(res.IsErr(), "ExecTx/Bad DeliverTx: Expected error return from ExecTx, returned: %v", res)
fmt.Sprintf("ExecTx/Bad DeliverTx: Expected error return from ExecTx, returned: %v", res))
assert.False(balIn.IsEqual(balInExp), assert.False(balIn.IsEqual(balInExp),
fmt.Sprintf("ExecTx/Bad DeliverTx: balance shouldn't be equal for accIn: got %v, expected: %v", balIn, balInExp)) "ExecTx/Bad DeliverTx: balance shouldn't be equal for accIn: got %v, expected: %v", balIn, balInExp)
assert.False(balOut.IsEqual(balOutExp), assert.False(balOut.IsEqual(balOutExp),
fmt.Sprintf("ExecTx/Bad DeliverTx: balance shouldn't be equal for accOut: got %v, expected: %v", balOut, balOutExp)) "ExecTx/Bad DeliverTx: balance shouldn't be equal for accOut: got %v, expected: %v", balOut, balOutExp)
//Regular CheckTx //Regular CheckTx
et.reset() et.reset()
et.acc2State(et.accIn) et.acc2State(et.accIn)
et.acc2State(et.accOut) et.acc2State(et.accOut)
res, _, _, _, _ = et.exec(txs, true) res, _, _, _, _ = et.exec(txs, true)
assert.True(res.IsOK(), fmt.Sprintf("ExecTx/Good CheckTx: Expected OK return from ExecTx, Error: %v", res)) assert.True(res.IsOK(), "ExecTx/Good CheckTx: Expected OK return from ExecTx, Error: %v", res)
//Regular DeliverTx //Regular DeliverTx
et.reset() et.reset()
et.acc2State(et.accIn) et.acc2State(et.accIn)
et.acc2State(et.accOut) et.acc2State(et.accOut)
res, balIn, balInExp, balOut, balOutExp = et.exec(txs, false) res, balIn, balInExp, balOut, balOutExp = et.exec(txs, false)
assert.True(res.IsOK(), assert.True(res.IsOK(), "ExecTx/Good DeliverTx: Expected OK return from ExecTx, Error: %v", res)
fmt.Sprintf("ExecTx/Good DeliverTx: Expected OK return from ExecTx, Error: %v", res))
assert.True(balIn.IsEqual(balInExp), assert.True(balIn.IsEqual(balInExp),
fmt.Sprintf("ExecTx/good DeliverTx: unexpected change in input balance, got: %v, expected: %v", balIn, balInExp)) "ExecTx/good DeliverTx: unexpected change in input balance, got: %v, expected: %v", balIn, balInExp)
assert.True(balOut.IsEqual(balOutExp), assert.True(balOut.IsEqual(balOutExp),
fmt.Sprintf("ExecTx/good DeliverTx: unexpected change in output balance, got: %v, expected: %v", balOut, balOutExp)) "ExecTx/good DeliverTx: unexpected change in output balance, got: %v, expected: %v", balOut, balOutExp)
} }

3
types/account_test.go
View File

@ -1,7 +1,6 @@
package types package types
import ( import (
"fmt"
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -14,7 +13,7 @@ func TestNilAccount(t *testing.T) {
//test Copy //test Copy
accCopy := acc.Copy() accCopy := acc.Copy()
//note that the assert.True is used instead of assert.Equal because looking at pointers //note that the assert.True is used instead of assert.Equal because looking at pointers
assert.True(t, &acc != accCopy, fmt.Sprintf("Account Copy Error, acc1: %v, acc2: %v", &acc, accCopy)) assert.True(t, &acc != accCopy, "Account Copy Error, acc1: %v, acc2: %v", &acc, accCopy)
assert.Equal(t, acc.Sequence, accCopy.Sequence) assert.Equal(t, acc.Sequence, accCopy.Sequence)
//test sending nils for panic //test sending nils for panic

7
types/coin_test.go
View File

@ -1,7 +1,6 @@
package types package types
import ( import (
"fmt"
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -44,9 +43,9 @@ func TestCoins(t *testing.T) {
} }
assert.True(good.IsValid(), "Coins are valid") assert.True(good.IsValid(), "Coins are valid")
assert.True(good.IsPositive(), fmt.Sprintf("Expected coins to be positive: %v", good)) assert.True(good.IsPositive(), "Expected coins to be positive: %v", good)
assert.True(good.IsGTE(empty), fmt.Sprintf("Expected %v to be >= %v", good, empty)) assert.True(good.IsGTE(empty), "Expected %v to be >= %v", good, empty)
assert.False(neg.IsPositive(), fmt.Sprintf("Expected neg coins to not be positive: %v", neg)) assert.False(neg.IsPositive(), "Expected neg coins to not be positive: %v", neg)
assert.Zero(len(sum), "Expected 0 coins") assert.Zero(len(sum), "Expected 0 coins")
assert.False(badSort1.IsValid(), "Coins are not sorted") assert.False(badSort1.IsValid(), "Coins are not sorted")
assert.False(badSort2.IsValid(), "Coins are not sorted") assert.False(badSort2.IsValid(), "Coins are not sorted")

4
types/tx_test.go
View File

@ -44,7 +44,7 @@ func TestSendTxSignable(t *testing.T) {
expected := "010A746573745F636861696E0100000000000000DE00000000000000006F01020106696E7075743101010000000000000030390301093200000106696E70757432010100000000000000006F01DE0000010201076F757470757431010100000000000000014D01076F75747075743201010000000000000001BC" expected := "010A746573745F636861696E0100000000000000DE00000000000000006F01020106696E7075743101010000000000000030390301093200000106696E70757432010100000000000000006F01DE0000010201076F757470757431010100000000000000014D01076F75747075743201010000000000000001BC"
assert.Equal(t, signBytesHex, expected, assert.Equal(t, signBytesHex, expected,
fmt.Sprintf("Got unexpected sign string for SendTx. Expected:\n%v\nGot:\n%v", expected, signBytesHex)) "Got unexpected sign string for SendTx. Expected:\n%v\nGot:\n%v", expected, signBytesHex)
} }
func TestAppTxSignable(t *testing.T) { func TestAppTxSignable(t *testing.T) {
@ -64,7 +64,7 @@ func TestAppTxSignable(t *testing.T) {
expected := "010A746573745F636861696E0100000000000000DE00000000000000006F0101580106696E70757431010100000000000000303903010932000001056461746131" expected := "010A746573745F636861696E0100000000000000DE00000000000000006F0101580106696E70757431010100000000000000303903010932000001056461746131"
assert.Equal(t, signBytesHex, expected, assert.Equal(t, signBytesHex, expected,
fmt.Sprintf("Got unexpected sign string for SendTx. Expected:\n%v\nGot:\n%v", expected, signBytesHex)) "Got unexpected sign string for SendTx. Expected:\n%v\nGot:\n%v", expected, signBytesHex)
} }
func TestSendTxJSON(t *testing.T) { func TestSendTxJSON(t *testing.T) {