通过table 实现本地数据，不需要额外返回kv

plugin/dapp/trade/executor/exec_del_local.go

@@ -47,48 +47,42 @@ func (t *trade) localDelLog(tx *types.Transaction, receipt *types.ReceiptData, i
 			if err != nil {
 				panic(err) //数据错误了，已经被修改了
 			}
-			kv := t.deleteSell(receipt.Base, item.Ty, tx, txIndex, table, tradedBoardlot)
-			set.KV = append(set.KV, kv...)
+			t.deleteSell(receipt.Base, item.Ty, tx, txIndex, table, tradedBoardlot)
 		} else if item.Ty == pty.TyLogTradeSellRevoke {
 			var receipt pty.ReceiptTradeSellRevoke
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {
 				panic(err) //数据错误了，已经被修改了
 			}
-			kv := t.deleteSell(receipt.Base, item.Ty, tx, txIndex, table, tradedBoardlot)
-			set.KV = append(set.KV, kv...)
+			t.deleteSell(receipt.Base, item.Ty, tx, txIndex, table, tradedBoardlot)
 		} else if item.Ty == pty.TyLogTradeBuyMarket {
 			var receipt pty.ReceiptTradeBuyMarket
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {
 				panic(err) //数据错误了，已经被修改了
 			}
-			kv := t.deleteBuy(receipt.Base, txIndex, table)
-			set.KV = append(set.KV, kv...)
+			t.deleteBuy(receipt.Base, txIndex, table)
 		} else if item.Ty == pty.TyLogTradeBuyRevoke {
 			var receipt pty.ReceiptTradeBuyRevoke
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {
 				panic(err) //数据错误了，已经被修改了
 			}
-			kv := t.deleteBuyLimit(receipt.Base, item.Ty, tx, txIndex, table, tradedBoardlot)
-			set.KV = append(set.KV, kv...)
+			t.deleteBuyLimit(receipt.Base, item.Ty, tx, txIndex, table, tradedBoardlot)
 		} else if item.Ty == pty.TyLogTradeBuyLimit {
 			var receipt pty.ReceiptTradeBuyLimit
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {
 				panic(err) //数据错误了，已经被修改了
 			}
-			kv := t.deleteBuyLimit(receipt.Base, item.Ty, tx, txIndex, table, tradedBoardlot)
-			set.KV = append(set.KV, kv...)
+			t.deleteBuyLimit(receipt.Base, item.Ty, tx, txIndex, table, tradedBoardlot)
 		} else if item.Ty == pty.TyLogTradeSellMarket {
 			var receipt pty.ReceiptSellMarket
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {
 				panic(err) //数据错误了，已经被修改了
 			}
-			kv := t.deleteSellMarket(receipt.Base, txIndex, table)
-			set.KV = append(set.KV, kv...)
+			t.deleteSellMarket(receipt.Base, txIndex, table)
 		}
 	}
 	newKvs, err := table.Save()

plugin/dapp/trade/executor/exec_local.go

@@ -47,24 +47,21 @@ func (t *trade) localAddLog(tx *types.Transaction, receipt *types.ReceiptData, i
 			if err != nil {
 				panic(err) //数据错误了，已经被修改了
 			}
-			kv := t.saveSell(receipt.Base, item.Ty, tx, txIndex, table)
-			set.KV = append(set.KV, kv...)
+			t.saveSell(receipt.Base, item.Ty, tx, txIndex, table)
 		} else if item.Ty == pty.TyLogTradeSellRevoke {
 			var receipt pty.ReceiptTradeSellRevoke
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {
 				panic(err) //数据错误了，已经被修改了
 			}
-			kv := t.saveSell(receipt.Base, item.Ty, tx, txIndex, table)
-			set.KV = append(set.KV, kv...)
+			t.saveSell(receipt.Base, item.Ty, tx, txIndex, table)
 		} else if item.Ty == pty.TyLogTradeBuyMarket {
 			var receipt pty.ReceiptTradeBuyMarket
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {
 				panic(err) //数据错误了，已经被修改了
 			}
-			kv := t.saveBuy(receipt.Base, tx, txIndex, table)
-			set.KV = append(set.KV, kv...)
+			t.saveBuy(receipt.Base, tx, txIndex, table)
 		} else if item.Ty == pty.TyLogTradeBuyRevoke {
 			var receipt pty.ReceiptTradeBuyRevoke
 			err := types.Decode(item.Log, &receipt)
@@ -72,8 +69,7 @@ func (t *trade) localAddLog(tx *types.Transaction, receipt *types.ReceiptData, i
 				panic(err) //数据错误了，已经被修改了
 			}
 
-			kv := t.saveBuyLimit(receipt.Base, item.Ty, tx, txIndex, table)
-			set.KV = append(set.KV, kv...)
+			t.saveBuyLimit(receipt.Base, item.Ty, tx, txIndex, table)
 		} else if item.Ty == pty.TyLogTradeBuyLimit {
 			var receipt pty.ReceiptTradeBuyLimit
 			err := types.Decode(item.Log, &receipt)
@@ -81,17 +77,14 @@ func (t *trade) localAddLog(tx *types.Transaction, receipt *types.ReceiptData, i
 				panic(err) //数据错误了，已经被修改了
 			}
 
-			kv := t.saveBuyLimit(receipt.Base, item.Ty, tx, txIndex, table)
-			set.KV = append(set.KV, kv...)
+			t.saveBuyLimit(receipt.Base, item.Ty, tx, txIndex, table)
 		} else if item.Ty == pty.TyLogTradeSellMarket {
 			var receipt pty.ReceiptSellMarket
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {
 				panic(err) //数据错误了，已经被修改了
 			}
-			kv := t.saveSellMarket(receipt.Base, tx, txIndex, table)
-			//tradelog.Info("saveSellMarket", "kv", kv)
-			set.KV = append(set.KV, kv...)
+			t.saveSellMarket(receipt.Base, tx, txIndex, table)
 		}
 	}
 	newKvs, err := table.Save()

plugin/dapp/trade/executor/trade.go

@@ -74,7 +74,7 @@ func (t *trade) getSellOrderFromDb(sellID []byte) *pty.SellOrder {
 }
 
 // sell limit
-func (t *trade) saveSell(base *pty.ReceiptSellBase, ty int32, tx *types.Transaction, txIndex string, ldb *table.Table) []*types.KeyValue {
+func (t *trade) saveSell(base *pty.ReceiptSellBase, ty int32, tx *types.Transaction, txIndex string, ldb *table.Table) {
 	sellorder := t.getSellOrderFromDb([]byte(base.SellID))
 
 	if ty == pty.TyLogTradeSellLimit && sellorder.SoldBoardlot == 0 {
@@ -84,31 +84,27 @@ func (t *trade) saveSell(base *pty.ReceiptSellBase, ty int32, tx *types.Transact
 	} else {
 		t.updateSellLimit(tx, base, sellorder, txIndex, ldb)
 	}
-	return nil
 }
 
-func (t *trade) deleteSell(base *pty.ReceiptSellBase, ty int32, tx *types.Transaction, txIndex string, ldb *table.Table, tradedBoardlot int64) []*types.KeyValue {
+func (t *trade) deleteSell(base *pty.ReceiptSellBase, ty int32, tx *types.Transaction, txIndex string, ldb *table.Table, tradedBoardlot int64) {
 	sellorder := t.getSellOrderFromDb([]byte(base.SellID))
 	if ty == pty.TyLogTradeSellLimit && sellorder.SoldBoardlot == 0 {
 		ldb.Del([]byte(txIndex))
 	} else {
 		t.rollBackSellLimit(tx, base, sellorder, txIndex, ldb, tradedBoardlot)
 	}
-	return nil
 }
 
-func (t *trade) saveBuy(receiptTradeBuy *pty.ReceiptBuyBase, tx *types.Transaction, txIndex string, ldb *table.Table) []*types.KeyValue {
+func (t *trade) saveBuy(receiptTradeBuy *pty.ReceiptBuyBase, tx *types.Transaction, txIndex string, ldb *table.Table) {
 	//tradelog.Info("save", "buy", receiptTradeBuy)
 
 	order := t.genBuyMarket(tx, receiptTradeBuy, txIndex)
 	tradelog.Debug("trade BuyMarket save local", "order", order)
 	ldb.Add(order)
-	return nil
 }
 
-func (t *trade) deleteBuy(receiptTradeBuy *pty.ReceiptBuyBase, txIndex string, ldb *table.Table) []*types.KeyValue {
+func (t *trade) deleteBuy(receiptTradeBuy *pty.ReceiptBuyBase, txIndex string, ldb *table.Table) {
 	ldb.Del([]byte(txIndex))
-	return nil
 }
 
 // BuyLimit Local
@@ -122,7 +118,7 @@ func (t *trade) getBuyOrderFromDb(buyID []byte) *pty.BuyLimitOrder {
 	return &buyOrder
 }
 
-func (t *trade) saveBuyLimit(buy *pty.ReceiptBuyBase, ty int32, tx *types.Transaction, txIndex string, ldb *table.Table) []*types.KeyValue {
+func (t *trade) saveBuyLimit(buy *pty.ReceiptBuyBase, ty int32, tx *types.Transaction, txIndex string, ldb *table.Table) {
 	buyOrder := t.getBuyOrderFromDb([]byte(buy.BuyID))
 	tradelog.Debug("Table", "buy-add", buyOrder)
 	if buyOrder.Status == pty.TradeOrderStatusOnBuy && buy.BoughtBoardlot == 0 {
@@ -132,29 +128,25 @@ func (t *trade) saveBuyLimit(buy *pty.ReceiptBuyBase, ty int32, tx *types.Transa
 	} else {
 		t.updateBuyLimit(tx, buy, buyOrder, txIndex, ldb)
 	}
-
-	return nil
 }
 
-func (t *trade) deleteBuyLimit(buy *pty.ReceiptBuyBase, ty int32, tx *types.Transaction, txIndex string, ldb *table.Table, traded int64) []*types.KeyValue {
+func (t *trade) deleteBuyLimit(buy *pty.ReceiptBuyBase, ty int32, tx *types.Transaction, txIndex string, ldb *table.Table, traded int64) {
 	buyOrder := t.getBuyOrderFromDb([]byte(buy.BuyID))
 	if ty == pty.TyLogTradeBuyLimit && buy.BoughtBoardlot == 0 {
 		ldb.Del([]byte(txIndex))
 	} else {
 		t.rollbackBuyLimit(tx, buy, buyOrder, txIndex, ldb, traded)
 	}
-	return nil
 }
 
-func (t *trade) saveSellMarket(receiptTradeBuy *pty.ReceiptSellBase, tx *types.Transaction, txIndex string, ldb *table.Table) []*types.KeyValue {
+func (t *trade) saveSellMarket(receiptTradeBuy *pty.ReceiptSellBase, tx *types.Transaction, txIndex string, ldb *table.Table) {
 	order := t.genSellMarket(tx, receiptTradeBuy, txIndex)
 	ldb.Add(order)
-	return nil
+
 }
 
-func (t *trade) deleteSellMarket(receiptTradeBuy *pty.ReceiptSellBase, txIndex string, ldb *table.Table) []*types.KeyValue {
+func (t *trade) deleteSellMarket(receiptTradeBuy *pty.ReceiptSellBase, txIndex string, ldb *table.Table) {
 	ldb.Del([]byte(txIndex))
-	return nil
 }
 
 // CheckReceiptExecOk return true to check if receipt ty is ok