Commit 3c9a08ca authored by harrylee's avatar harrylee Committed by vipwzw

add just some code

parent 5d8922a2
...@@ -76,6 +76,9 @@ func (e *exchange) CheckTx(tx *types.Transaction, index int) error { ...@@ -76,6 +76,9 @@ func (e *exchange) CheckTx(tx *types.Transaction, index int) error {
return exchangetypes.ErrAssetOp return exchangetypes.ErrAssetOp
} }
} }
if exchange.Ty == exchangetypes.TyMarketOrderAction {
return types.ErrActionNotSupport
}
return nil return nil
} }
......
...@@ -422,7 +422,7 @@ func TestExchange(t *testing.T) { ...@@ -422,7 +422,7 @@ func TestExchange(t *testing.T) {
//订单1的状态应该还是ordered //订单1的状态应该还是ordered
reply = msg.(*et.Order) reply = msg.(*et.Order)
assert.Equal(t, int32(et.Completed), reply.Status) assert.Equal(t, int32(et.Completed), reply.Status)
//根据op查询市场深度 //根据op查询市场深度,这时候应该查不到
msg, err = exec.Query(et.FuncNameQueryMarketDepth, types.Encode(&et.QueryMarketDepth{LeftAsset: &et.Asset{Symbol: "bty", Execer: "coins"}, msg, err = exec.Query(et.FuncNameQueryMarketDepth, types.Encode(&et.QueryMarketDepth{LeftAsset: &et.Asset{Symbol: "bty", Execer: "coins"},
RightAsset: &et.Asset{Execer: "paracross", Symbol: "coins.bty"}, Op: et.OpSell})) RightAsset: &et.Asset{Execer: "paracross", Symbol: "coins.bty"}, Op: et.OpSell}))
if err != nil { if err != nil {
...@@ -430,6 +430,15 @@ func TestExchange(t *testing.T) { ...@@ -430,6 +430,15 @@ func TestExchange(t *testing.T) {
} }
reply1 = msg.(*et.MarketDepthList) reply1 = msg.(*et.MarketDepthList)
t.Log(reply1.List) t.Log(reply1.List)
//根据状态和地址查询
msg, err = exec.Query(et.FuncNameQueryOrderList, types.Encode(&et.QueryOrderList{Status: et.Completed, Address: string(Nodes[0])}))
if err != nil {
t.Error(err)
}
reply2 = msg.(*et.OrderList)
t.Log(reply2)
assert.Equal(t, 2, len(reply2.List))
} }
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) { func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
......
package executor package executor
import ( import (
"fmt"
"github.com/33cn/chain33/types" "github.com/33cn/chain33/types"
exchangetypes "github.com/33cn/plugin/plugin/dapp/exchange/types" exchangetypes "github.com/33cn/plugin/plugin/dapp/exchange/types"
) )
...@@ -18,7 +17,7 @@ func (e *exchange) Exec_LimitOrder(payload *exchangetypes.LimitOrder, tx *types. ...@@ -18,7 +17,7 @@ func (e *exchange) Exec_LimitOrder(payload *exchangetypes.LimitOrder, tx *types.
func (e *exchange) Exec_MarketOrder(payload *exchangetypes.MarketOrder, tx *types.Transaction, index int) (*types.Receipt, error) { func (e *exchange) Exec_MarketOrder(payload *exchangetypes.MarketOrder, tx *types.Transaction, index int) (*types.Receipt, error) {
//TODO marketOrder //TODO marketOrder
return nil, fmt.Errorf("%s", "not support MarketOrder..") return nil, types.ErrActionNotSupport
} }
func (e *exchange) Exec_RevokeOrder(payload *exchangetypes.RevokeOrder, tx *types.Transaction, index int) (*types.Receipt, error) { func (e *exchange) Exec_RevokeOrder(payload *exchangetypes.RevokeOrder, tx *types.Transaction, index int) (*types.Receipt, error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment