fix exec and test

plugin/dapp/trade/executor/exec_test.go

@@ -138,7 +138,7 @@ func TestTrade_Exec_SellLimit(t *testing.T) {
 
 	// test buy market
 	buy := &pty.TradeBuyTx{
-		SellID:      sellOrder.SellID,
+		SellID:      sellOrder.SellID[len("mavl-trade-sell-"):],
 		BoardlotCnt: buyArgs.total,
 		Fee:         0,
 	}
@@ -278,7 +278,7 @@ func TestTrade_Exec_BuyLimit(t *testing.T) {
 	assert.Nil(t, err)
 
 	sell := &pty.TradeSellMarketTx{
-		BuyID:       buyLimitOrder.BuyID,
+		BuyID:       buyLimitOrder.BuyID[len("mavl-trade-buy-"):],
 		BoardlotCnt: sellArgs.total,
 		Fee:         0,
 	}

plugin/dapp/trade/executor/tradedb.go

@@ -497,7 +497,7 @@ func (action *tradeAction) tradeBuyLimit(buy *pty.TradeForBuyLimit) (*types.Rece
 
 func (action *tradeAction) tradeSellMarket(sellOrder *pty.TradeForSellMarket) (*types.Receipt, error) {
 	if types.IsDappFork(action.height, pty.TradeX, pty.ForkTradeIDX) {
-		sellOrder.BuyID = calcTokenSellID(sellOrder.BuyID)
+		sellOrder.BuyID = calcTokenBuyID(sellOrder.BuyID)
 	}
 	if sellOrder.BoardlotCnt < 0 || !strings.HasPrefix(sellOrder.BuyID, buyIDPrefix) {
 		return nil, types.ErrInvalidParam
@@ -572,7 +572,7 @@ func (action *tradeAction) tradeSellMarket(sellOrder *pty.TradeForSellMarket) (*
 
 func (action *tradeAction) tradeRevokeBuyLimit(revoke *pty.TradeForRevokeBuy) (*types.Receipt, error) {
 	if types.IsDappFork(action.height, pty.TradeX, pty.ForkTradeIDX) {
-		revoke.BuyID = calcTokenSellID(revoke.BuyID)
+		revoke.BuyID = calcTokenBuyID(revoke.BuyID)
 	}
 	if !strings.HasPrefix(revoke.BuyID, buyIDPrefix) {
 		return nil, types.ErrInvalidParam