diff --git a/mempool/clist_mempool.go b/mempool/clist_mempool.go index 46088a6bf..55e3a2327 100644 --- a/mempool/clist_mempool.go +++ b/mempool/clist_mempool.go @@ -334,13 +334,7 @@ func (mem *CListMempool) reqResCb( panic("recheck cursor is not nil in reqResCb") } - err := mem.resCbFirstTime(tx, peerID, peerP2PID, res) - if err != nil { - if externalCb != nil { - externalCb(abci.ToResponseException(err.Error())) - } - return - } + mem.resCbFirstTime(tx, peerID, peerP2PID, res) // update metrics mem.metrics.Size.Set(float64(mem.Size())) @@ -400,11 +394,11 @@ func (mem *CListMempool) resCbFirstTime( peerID uint16, peerP2PID p2p.ID, res *abci.Response, -) error { +) { switch r := res.Value.(type) { case *abci.Response_CheckTx: var postCheckErr error - if (r.CheckTx.Code == abci.CodeTypeOK) && mem.postCheck != nil { + if mem.postCheck != nil { postCheckErr = mem.postCheck(tx, r.CheckTx) } if (r.CheckTx.Code == abci.CodeTypeOK) && postCheckErr == nil { @@ -414,7 +408,7 @@ func (mem *CListMempool) resCbFirstTime( // remove from cache (mempool might have a space later) mem.cache.Remove(tx) mem.logger.Error(err.Error()) - return err + return } memTx := &mempoolTx{ @@ -438,13 +432,10 @@ func (mem *CListMempool) resCbFirstTime( mem.metrics.FailedTxs.Add(1) // remove from cache (it might be good later) mem.cache.Remove(tx) - return postCheckErr } default: // ignore other messages } - - return nil } // callback, which is called after the app rechecked the tx. diff --git a/rpc/core/mempool.go b/rpc/core/mempool.go index 663bea9bc..2c417c407 100644 --- a/rpc/core/mempool.go +++ b/rpc/core/mempool.go @@ -41,10 +41,6 @@ func BroadcastTxSync(ctx *rpctypes.Context, tx types.Tx) (*ctypes.ResultBroadcas return nil, err } res := <-resCh - except := res.GetException() - if except != nil { - return nil, fmt.Errorf(except.Error) - } r := res.GetCheckTx() return &ctypes.ResultBroadcastTx{ Code: r.Code, @@ -88,11 +84,6 @@ func BroadcastTxCommit(ctx *rpctypes.Context, tx types.Tx) (*ctypes.ResultBroadc return nil, fmt.Errorf("error on broadcastTxCommit: %v", err) } checkTxResMsg := <-checkTxResCh - checkTxExcept := checkTxResMsg.GetException() - if checkTxExcept != nil { - env.Logger.Error("Error on broadcastTxCommit", "err", checkTxExcept.Error) - return nil, fmt.Errorf("error on broadcastTxCommit: %v", checkTxExcept.Error) - } checkTxRes := checkTxResMsg.GetCheckTx() if checkTxRes.Code != abci.CodeTypeOK { return &ctypes.ResultBroadcastTxCommit{