Engine improvements

exchanges/zb/zb_test.go

@@ -288,25 +288,25 @@ func areTestAPIKeysSet() bool {
 func TestSubmitOrder(t *testing.T) {
 	z.SetDefaults()
 	TestSetup(t)
-
 	if areTestAPIKeysSet() && !canManipulateRealOrders {
 		t.Skip(fmt.Sprintf("ApiKey: %s. Can place orders: %v",
 			z.API.Credentials.Key,
 			canManipulateRealOrders))
 	}
-	var pair = currency.Pair{
-		Delimiter: "_",
-		Base:      currency.QTUM,
-		Quote:     currency.USDT,
+
+	var orderSubmission = &exchange.OrderSubmission{
+		Pair: currency.Pair{
+			Delimiter: "_",
+			Base:      currency.QTUM,
+			Quote:     currency.USD,
+		},
+		OrderSide: exchange.BuyOrderSide,
+		OrderType: exchange.LimitOrderType,
+		Price:     1,
+		Amount:    1,
+		ClientID:  "meowOrder",
 	}
-
-	response, err := z.SubmitOrder(pair,
-		exchange.BuyOrderSide,
-		exchange.LimitOrderType,
-		1,
-		10,
-		"hi")
-
+	response, err := z.SubmitOrder(orderSubmission)
 	if areTestAPIKeysSet() && (err != nil || !response.IsOrderPlaced) {
 		t.Errorf("Order failed to be placed: %v", err)
 	} else if !areTestAPIKeysSet() && err == nil {

exchanges/zb/zb_wrapper.go

@@ -300,32 +300,36 @@ func (z *ZB) GetExchangeHistory(p currency.Pair, assetType assets.AssetType) ([]
 }
 
 // SubmitOrder submits a new order
-func (z *ZB) SubmitOrder(p currency.Pair, side exchange.OrderSide, _ exchange.OrderType, amount, price float64, _ string) (exchange.SubmitOrderResponse, error) {
+func (z *ZB) SubmitOrder(order *exchange.OrderSubmission) (exchange.SubmitOrderResponse, error) {
 	var submitOrderResponse exchange.SubmitOrderResponse
-	var oT SpotNewOrderRequestParamsType
+	if order == nil {
+		return submitOrderResponse, exchange.ErrOrderSubmissionIsNil
+	}
 
-	if side == exchange.BuyOrderSide {
+	if err := order.Validate(); err != nil {
+		return submitOrderResponse, err
+	}
+
+	var oT SpotNewOrderRequestParamsType
+	if order.OrderSide == exchange.BuyOrderSide {
 		oT = SpotNewOrderRequestParamsTypeBuy
 	} else {
 		oT = SpotNewOrderRequestParamsTypeSell
 	}
 
 	var params = SpotNewOrderRequestParams{
-		Amount: amount,
-		Price:  price,
-		Symbol: strings.ToLower(p.String()),
+		Amount: order.Amount,
+		Price:  order.Price,
+		Symbol: order.Pair.Lower().String(),
 		Type:   oT,
 	}
 	response, err := z.SpotNewOrder(params)
-
 	if response > 0 {
 		submitOrderResponse.OrderID = fmt.Sprintf("%v", response)
 	}
-
 	if err == nil {
 		submitOrderResponse.IsOrderPlaced = true
 	}
-
 	return submitOrderResponse, err
 }