Browse Source

Use protobuf enums for CodeType

pull/192/head
Jae Kwon 9 years ago
parent
commit
f1b48ff009
3 changed files with 4 additions and 4 deletions
  1. +1
    -1
      mempool/mempool.go
  2. +1
    -1
      mempool/mempool_test.go
  3. +2
    -2
      state/execution.go

+ 1
- 1
mempool/mempool.go View File

@ -104,7 +104,7 @@ func (mem *Mempool) CheckTx(tx types.Tx) (err error) {
func (mem *Mempool) resCb(req *tmsp.Request, res *tmsp.Response) {
switch res.Type {
case tmsp.MessageType_CheckTx:
if tmsp.RetCode(res.Code) == tmsp.RetCodeOK {
if res.Code == tmsp.CodeType_OK {
mem.counter++
memTx := &mempoolTx{
counter: mem.counter,


+ 1
- 1
mempool/mempool_test.go View File

@ -72,7 +72,7 @@ func TestSerialReap(t *testing.T) {
txBytes := make([]byte, 8)
binary.BigEndian.PutUint64(txBytes, uint64(i))
code, result, logStr := appConnCon.AppendTx(txBytes)
if code != tmsp.RetCodeOK {
if code != tmsp.CodeType_OK {
t.Errorf("Error committing tx. Code:%v result:%X log:%v",
code, result, logStr)
}


+ 2
- 2
state/execution.go View File

@ -67,7 +67,7 @@ func (s *State) execBlockOnProxyApp(evsw *events.EventSwitch, proxyAppConn proxy
// TODO: make use of this info
// Blocks may include invalid txs.
// reqAppendTx := req.(tmsp.RequestAppendTx)
if tmsp.RetCode(res.Code) == tmsp.RetCodeOK {
if res.Code == tmsp.CodeType_OK {
validTxs += 1
} else {
log.Debug("Invalid tx", "code", res.Code, "log", res.Log)
@ -159,7 +159,7 @@ func updateValidatorsWithBlock(lastValSet *types.ValidatorSet, valSet *types.Val
type InvalidTxError struct {
Tx types.Tx
Code tmsp.RetCode
Code tmsp.CodeType
}
func (txErr InvalidTxError) Error() string {


Loading…
Cancel
Save