Commit returns tmsp.Result; Move errors to tmsp/errors.go

This commit is contained in:
Jae Kwon
2016-03-23 02:47:05 -07:00
parent 4810acbd9d
commit ed9dd875a7
6 changed files with 85 additions and 87 deletions
-22
View File
@@ -1,22 +0,0 @@
package types
import (
tmsp "github.com/tendermint/tmsp/types"
)
var (
ErrInternalError = tmsp.NewError(tmsp.CodeType_InternalError, "Internal error")
ErrDuplicateAddress = tmsp.NewError(tmsp.CodeType_BaseDuplicateAddress, "Error duplicate address")
ErrEncodingError = tmsp.NewError(tmsp.CodeType_BaseEncodingError, "Error encoding error")
ErrInsufficientFees = tmsp.NewError(tmsp.CodeType_BaseInsufficientFees, "Error insufficient fees")
ErrInsufficientFunds = tmsp.NewError(tmsp.CodeType_BaseInsufficientFunds, "Error insufficient funds")
ErrInsufficientGasPrice = tmsp.NewError(tmsp.CodeType_BaseInsufficientGasPrice, "Error insufficient gas price")
ErrInvalidAddress = tmsp.NewError(tmsp.CodeType_BaseInvalidAddress, "Error invalid address")
ErrInvalidAmount = tmsp.NewError(tmsp.CodeType_BaseInvalidAmount, "Error invalid amount")
ErrInvalidPubKey = tmsp.NewError(tmsp.CodeType_BaseInvalidPubKey, "Error invalid pubkey")
ErrInvalidSequence = tmsp.NewError(tmsp.CodeType_BaseInvalidSequence, "Error invalid sequence")
ErrInvalidSignature = tmsp.NewError(tmsp.CodeType_BaseInvalidSignature, "Error invalid signature")
ErrUnknownPubKey = tmsp.NewError(tmsp.CodeType_BaseUnknownPubKey, "Error unknown pubkey")
ResultOK = tmsp.NewResultOK(nil, "")
)
+6 -6
View File
@@ -48,12 +48,12 @@ type TxInput struct {
func (txIn TxInput) ValidateBasic() tmsp.Result {
if len(txIn.Address) != 20 {
return ErrInvalidAddress
return tmsp.ErrBaseInvalidAddress
}
if txIn.Amount == 0 {
return ErrInvalidAmount
return tmsp.ErrBaseInvalidAmount
}
return ResultOK
return tmsp.OK
}
func (txIn TxInput) SignBytes() []byte {
@@ -74,12 +74,12 @@ type TxOutput struct {
func (txOut TxOutput) ValidateBasic() tmsp.Result {
if len(txOut.Address) != 20 {
return ErrInvalidAddress
return tmsp.ErrBaseInvalidAddress
}
if txOut.Amount == 0 {
return ErrInvalidAmount
return tmsp.ErrBaseInvalidAmount
}
return ResultOK
return tmsp.OK
}
func (txOut TxOutput) SignBytes() []byte {