fix test

vendor/github.com/33cn/chain33/executor/executor.go

@@ -130,6 +130,14 @@ func (exec *Executor) SetQueueClient(qcli queue.Client) {
 }
 
 func (exec *Executor) procExecQuery(msg *queue.Message) {
+	//panic 处理
+	defer func() {
+		if r := recover(); r != nil {
+			elog.Error("panic error", "err", r)
+			msg.Reply(exec.client.NewMessage("", types.EventReceipts, types.ErrExecPanic))
+			return
+		}
+	}()
 	header, err := exec.qclient.GetLastHeader()
 	if err != nil {
 		msg.Reply(exec.client.NewMessage("", types.EventBlockChainQuery, err))
@@ -169,6 +177,14 @@ func (exec *Executor) procExecQuery(msg *queue.Message) {
 }
 
 func (exec *Executor) procExecCheckTx(msg *queue.Message) {
+	//panic 处理
+	defer func() {
+		if r := recover(); r != nil {
+			elog.Error("panic error", "err", r)
+			msg.Reply(exec.client.NewMessage("", types.EventReceipts, types.ErrExecPanic))
+			return
+		}
+	}()
 	datas := msg.GetData().(*types.ExecTxList)
 	ctx := &executorCtx{
 		stateHash:  datas.StateHash,
@@ -205,6 +221,14 @@ func (exec *Executor) procExecCheckTx(msg *queue.Message) {
 }
 
 func (exec *Executor) procExecTxList(msg *queue.Message) {
+	//panic 处理
+	defer func() {
+		if r := recover(); r != nil {
+			elog.Error("panic error", "err", r)
+			msg.Reply(exec.client.NewMessage("", types.EventReceipts, types.ErrExecPanic))
+			return
+		}
+	}()
 	datas := msg.GetData().(*types.ExecTxList)
 	ctx := &executorCtx{
 		stateHash:  datas.StateHash,
@@ -279,6 +303,14 @@ func (exec *Executor) procExecTxList(msg *queue.Message) {
 }
 
 func (exec *Executor) procExecAddBlock(msg *queue.Message) {
+	//panic 处理
+	defer func() {
+		if r := recover(); r != nil {
+			elog.Error("panic error", "err", r)
+			msg.Reply(exec.client.NewMessage("", types.EventReceipts, types.ErrExecPanic))
+			return
+		}
+	}()
 	datas := msg.GetData().(*types.BlockDetail)
 	b := datas.Block
 	ctx := &executorCtx{
@@ -341,6 +373,14 @@ func (exec *Executor) procExecAddBlock(msg *queue.Message) {
 }
 
 func (exec *Executor) procExecDelBlock(msg *queue.Message) {
+	//panic 处理
+	defer func() {
+		if r := recover(); r != nil {
+			elog.Error("panic error", "err", r)
+			msg.Reply(exec.client.NewMessage("", types.EventReceipts, types.ErrExecPanic))
+			return
+		}
+	}()
 	datas := msg.GetData().(*types.BlockDetail)
 	b := datas.Block
 	ctx := &executorCtx{

vendor/github.com/33cn/chain33/types/error.go

@@ -180,4 +180,5 @@ var (
 	ErrHeightLessZero      = errors.New("ErrHeightLessZero")
 	ErrHeightOverflow      = errors.New("ErrHeightOverflow")
 	ErrRecordBlockSequence = errors.New("ErrRecordBlockSequence")
+	ErrExecPanic           = errors.New("ErrExecPanic")
 )