Moved content of txs package to sit next to the handlers

stack/helpers.go

@@ -1,14 +1,14 @@
 package stack
 
 import (
-	"github.com/pkg/errors"
-
 	"github.com/tendermint/go-wire/data"
 
 	"github.com/tendermint/basecoin"
+	"github.com/tendermint/basecoin/errors"
 	"github.com/tendermint/basecoin/state"
 )
 
+//nolint
 const (
 	NameOK    = "ok"
 	NameFail  = "fail"
@@ -16,6 +16,38 @@ const (
 	NameEcho  = "echo"
 )
 
+//nolint
+const (
+	ByteRawTx  = 0x1
+	TypeRawTx  = "raw"
+	rawMaxSize = 2000 * 1000
+)
+
+func init() {
+	basecoin.TxMapper.
+		RegisterImplementation(RawTx{}, TypeRawTx, ByteRawTx)
+}
+
+// RawTx just contains bytes that can be hex-ified
+type RawTx struct {
+	data.Bytes
+}
+
+func (r RawTx) Wrap() basecoin.Tx {
+	return basecoin.Tx{r}
+}
+
+func (r RawTx) ValidateBasic() error {
+	if len(r.Bytes) > rawMaxSize {
+		return errors.ErrTooLarge()
+	}
+	return nil
+}
+
+func NewRawTx(d []byte) basecoin.Tx {
+	return RawTx{data.Bytes(d)}.Wrap()
+}
+
 // OKHandler just used to return okay to everything
 type OKHandler struct {
 	Log string
@@ -75,12 +107,12 @@ func (_ FailHandler) Name() string {
 
 // CheckTx always returns the given error
 func (f FailHandler) CheckTx(ctx basecoin.Context, store state.KVStore, tx basecoin.Tx) (res basecoin.Result, err error) {
-	return res, errors.WithStack(f.Err)
+	return res, errors.Wrap(f.Err)
 }
 
 // DeliverTx always returns the given error
 func (f FailHandler) DeliverTx(ctx basecoin.Context, store state.KVStore, tx basecoin.Tx) (res basecoin.Result, err error) {
-	return res, errors.WithStack(f.Err)
+	return res, errors.Wrap(f.Err)
 }
 
 // PanicHandler always panics, using the given error (first choice) or msg (fallback)

stack/middleware_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/tendermint/basecoin"
 	"github.com/tendermint/basecoin/errors"
 	"github.com/tendermint/basecoin/state"
-	"github.com/tendermint/basecoin/txs"
 )
 
 const (
@@ -25,7 +24,7 @@ func TestPermissionSandbox(t *testing.T) {
 	// generic args
 	ctx := NewContext("test-chain", log.NewNopLogger())
 	store := state.NewMemKVStore()
-	raw := txs.NewRaw([]byte{1, 2, 3, 4})
+	raw := NewRawTx([]byte{1, 2, 3, 4})
 	rawBytes, err := data.ToWire(raw)
 	require.Nil(err)