Coin

errors/errors.go

@@ -1,15 +1,19 @@
 package errors
 
-import "fmt"
+import (
+	"fmt"
+
+	"github.com/pkg/errors"
+)
 
 const (
 	// ABCI Response Codes
-	CodeInternalError     = 1
-	CodeTxParseError      = 2
-	CodeBadNonce          = 3
-	CodeUnauthorized      = 4
-	CodeInsufficientFunds = 5
-	CodeUnknownRequest    = 6
+	CodeInternalError     uint32 = 1
+	CodeTxParseError             = 2
+	CodeBadNonce                 = 3
+	CodeUnauthorized             = 4
+	CodeInsufficientFunds        = 5
+	CodeUnknownRequest           = 6
 )
 
 // NOTE: Don't stringer this, we'll put better messages in later.
@@ -65,6 +69,8 @@ func UnknownRequest(log string) sdkError {
 type ABCIError interface {
 	ABCICode() uint32
 	ABCILog() string
+
+	Error() string
 }
 
 /*
@@ -132,3 +138,24 @@ func (err sdkError) WithCause(cause error) sdkError {
 	copy.cause = cause
 	return copy
 }
+
+// HasErrorCode checks if this error would return the named error code
+func HasErrorCode(err error, code uint32) bool {
+	// XXX Get the cause if not ABCIError
+	if abciErr, ok := err.(ABCIError); ok {
+		return abciErr.ABCICode() == code
+	}
+	return code == CodeInternalError
+}
+
+func IsSameError(pattern error, err error) bool {
+	return err != nil && (errors.Cause(err) == errors.Cause(pattern))
+}
+
+func WithCode(err error, code uint32) sdkError {
+	return sdkError{
+		code:  code,
+		cause: err,
+		log:   "",
+	}
+}

exports.go

@@ -14,5 +14,5 @@ type (
 	Decorator = types.Decorator
 
 	// Type aliases for other modules.
-	MultiStore = store.MultiStore modules.
+	MultiStore = store.MultiStore
 )

types/context.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	"context"
+
 	abci "github.com/tendermint/abci/types"
 )
 
@@ -11,12 +12,12 @@ type Context struct {
 	// it's probably not what you want to do.
 }
 
-func NewContext(header tm.Header, isCheckTx bool, txBytes []byte) Context {
+func NewContext(header abci.Header, isCheckTx bool, txBytes []byte) Context {
 	c := Context{
 		Context: context.Background(),
 	}
 	c = c.setBlockHeader(header)
-	c = c.setBlockHeight(int64(header.Height))
+	c = c.setBlockHeight(header.Height)
 	c = c.setChainID(header.ChainID)
 	c = c.setIsCheckTx(isCheckTx)
 	c = c.setTxBytes(txBytes)
@@ -48,8 +49,8 @@ const (
 	contextKeyTxBytes
 )
 
-func (c Context) BlockHeader() tm.Header {
-	return c.Value(contextKeyBlockHeader).(tm.Header)
+func (c Context) BlockHeader() abci.Header {
+	return c.Value(contextKeyBlockHeader).(abci.Header)
 }
 
 func (c Context) BlockHeight() int64 {
@@ -69,18 +70,18 @@ func (c Context) TxBytes() []byte {
 }
 
 // Unexposed to prevent overriding.
-func (c Context) setBlockHeader(header tm.Header) Context {
+func (c Context) setBlockHeader(header abci.Header) Context {
 	return c.WithValueSDK(contextKeyBlockHeader, header)
 }
 
 // Unexposed to prevent overriding.
 func (c Context) setBlockHeight(height int64) Context {
-	return c.WithValueSDK(contextKeyBlockHeight, header)
+	return c.WithValueSDK(contextKeyBlockHeight, height)
 }
 
 // Unexposed to prevent overriding.
 func (c Context) setChainID(chainID string) Context {
-	return c.WithValueSDK(contextKeyChainID, header)
+	return c.WithValueSDK(contextKeyChainID, chainID)
 }
 
 // Unexposed to prevent overriding.

types/decorators.go

@@ -1,11 +1,15 @@
 package types
 
+import (
+	"github.com/cosmos/cosmos-sdk/store"
+)
+
 // A Decorator executes before/during/after a handler to enhance functionality.
-type Decorator func(ctx Context, ms MultiStore, tx Tx, next Handler) Result
+type Decorator func(ctx Context, ms store.MultiStore, tx Tx, next Handler) Result
 
 // Return a decorated handler
 func Decorate(dec Decorator, next Handler) Handler {
-	return func(ctx Context, ms MultiStore, tx Tx) Result {
+	return func(ctx Context, ms store.MultiStore, tx Tx) Result {
 		return dec(ctx, ms, tx, next)
 	}
 }

types/decorators_test.go

@@ -0,0 +1,39 @@
+package types
+
+import (
+	"testing"
+
+	"github.com/cosmos/cosmos-sdk/store"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDecorate(t *testing.T) {
+
+	var calledDec1, calledDec2, calledHandler bool
+	dec1 := func(ctx Context, ms store.MultiStore, tx Tx, next Handler) Result {
+		calledDec1 = true
+		next(ctx, ms, tx)
+		return Result{}
+	}
+
+	dec2 := func(ctx Context, ms store.MultiStore, tx Tx, next Handler) Result {
+		calledDec2 = true
+		next(ctx, ms, tx)
+		return Result{}
+	}
+
+	handler := func(ctx Context, ms store.MultiStore, tx Tx) Result {
+		calledHandler = true
+		return Result{}
+	}
+
+	decoratedHandler := ChainDecorators(dec1, dec2).WithHandler(handler)
+
+	var ctx Context
+	var ms store.MultiStore
+	var tx Tx
+	decoratedHandler(ctx, ms, tx)
+	assert.True(t, calledDec1)
+	assert.True(t, calledDec2)
+	assert.True(t, calledHandler)
+}

types/handler.go

@@ -1,9 +1,9 @@
 package types
 
 import (
-	"github.com/cosmos/cosmos-sdk"
+	sdk "github.com/cosmos/cosmos-sdk"
 )
 
 // Handler handles both ABCI DeliverTx and CheckTx requests.
 // Iff ABCI.CheckTx, ctx.IsCheckTx() returns true.
-type Handler func(ctx Context, ms MultiStore, tx Tx)
+type Handler func(ctx Context, ms sdk.MultiStore, tx Tx) Result

types/signature.go

@@ -2,22 +2,7 @@ package types
 
 import crypto "github.com/tendermint/go-crypto"
 
-type Signature interface {
-	CryptoSig() crypto.Signature
-	Sequence() int
-}
-
-// StdSignature is a simple way to prevent replay attacks.
-// There must be better strategies, but this is simplest.
 type StdSignature struct {
 	crypto.Signature
-	Sequence int
-}
-
-func (ss StdSignature) CryptoSig() crypto.Signature {
-	return ss.Signature
-}
-
-func (ss StdSignature) Sequence() int {
-	return ss.Sequence
+	Sequence int64
 }

types/tx_msg.go

@@ -32,5 +32,5 @@ type Tx interface {
 	// CONTRACT: If the signature is missing (ie the Msg is
 	// invalid), then the corresponding signature is
 	// .Empty().
-	Signatures() []Signature
+	Signatures() []StdSignature
 }

x/auth/context.go

@@ -1,7 +1,7 @@
 package auth
 
 import (
-	sdk "github.com/cosmos/cosmos-sdk"
+	"github.com/cosmos/cosmos-sdk/types"
 )
 
 /*
@@ -13,7 +13,7 @@ import (
 	var acc accounts.Account
 
 	accounts.SetAccount(ctx, acc)
-	acc2, ok := accounts.GetAccount(ctx)
+	acc2 := accounts.GetAccount(ctx)
 
 */
 
@@ -24,10 +24,10 @@ const (
 	contextKeyAccount contextKey = iota
 )
 
-func SetAccount(ctx sdk.Context, account Account) sdk.Context {
-	return ctx.WithValue(contextKeyAccount, account)
+func SetAccount(ctx types.Context, account Account) types.Context {
+	return ctx.WithValueSDK(contextKeyAccount, account)
 }
 
-func GetAccount(ctx sdk.Context) (Account, bool) {
+func GetAccount(ctx types.Context) Account {
 	return ctx.Value(contextKeyAccount).(Account)
 }