Merge branch 'master' into engine

exchanges/websocket.go

@@ -51,6 +51,7 @@ func (e *Base) WebsocketSetup(connector func() error,
 	e.Websocket.SetConnector(connector)
 	e.Websocket.SetWebsocketURL(runningURL)
 	e.Websocket.SetExchangeName(exchangeName)
+	e.Websocket.SetCanUseAuthenticatedEndpoints(e.API.AuthenticatedWebsocketSupport)
 
 	e.Websocket.init = false
 	e.Websocket.noConnectionCheckLimit = 5
@@ -674,6 +675,21 @@ func (w *Websocket) FormatFunctionality() string {
 			case WebsocketUnsubscribeSupported:
 				functionality = append(functionality, WebsocketUnsubscribeSupportedText)
 
+			case WebsocketAuthenticatedEndpointsSupported:
+				functionality = append(functionality, WebsocketAuthenticatedEndpointsSupportedText)
+
+			case WebsocketAccountDataSupported:
+				functionality = append(functionality, WebsocketAccountDataSupportedText)
+
+			case WebsocketSubmitOrderSupported:
+				functionality = append(functionality, WebsocketSubmitOrderSupportedText)
+
+			case WebsocketCancelOrderSupported:
+				functionality = append(functionality, WebsocketCancelOrderSupportedText)
+
+			case WebsocketWithdrawSupported:
+				functionality = append(functionality, WebsocketWithdrawSupportedText)
+
 			default:
 				functionality = append(functionality,
 					fmt.Sprintf("%s[1<<%v]", UnknownWebsocketFunctionality, i))
@@ -839,7 +855,15 @@ func (w *Websocket) ResubscribeToChannel(subscribedChannel WebsocketChannelSubsc
 // SubscribeToChannels appends supplied channels to channelsToSubscribe
 func (w *Websocket) SubscribeToChannels(channels []WebsocketChannelSubscription) {
 	for i := range channels {
-		w.channelsToSubscribe = append(w.channelsToSubscribe, channels[i])
+		channelFound := false
+		for j := range w.channelsToSubscribe {
+			if w.channelsToSubscribe[j].Equal(&channels[i]) {
+				channelFound = true
+			}
+		}
+		if !channelFound {
+			w.channelsToSubscribe = append(w.channelsToSubscribe, channels[i])
+		}
 	}
 	w.noConnectionChecks = 0
 }
@@ -856,3 +880,25 @@ func (w *WebsocketChannelSubscription) Equal(subscribedChannel *WebsocketChannel
 	return strings.EqualFold(w.Channel, subscribedChannel.Channel) &&
 		strings.EqualFold(w.Currency.String(), subscribedChannel.Currency.String())
 }
+
+// GetSubscriptions returns a copied list of subscriptions
+// subscriptions is a private member and cannot be manipulated
+func (w *Websocket) GetSubscriptions() []WebsocketChannelSubscription {
+	return append(w.subscribedChannels[:0:0], w.subscribedChannels...)
+}
+
+// SetCanUseAuthenticatedEndpoints sets canUseAuthenticatedEndpoints val in
+// a thread safe manner
+func (w *Websocket) SetCanUseAuthenticatedEndpoints(val bool) {
+	w.subscriptionLock.Lock()
+	defer w.subscriptionLock.Unlock()
+	w.canUseAuthenticatedEndpoints = val
+}
+
+// CanUseAuthenticatedEndpoints gets canUseAuthenticatedEndpoints val in
+// a thread safe manner
+func (w *Websocket) CanUseAuthenticatedEndpoints() bool {
+	w.subscriptionLock.Lock()
+	defer w.subscriptionLock.Unlock()
+	return w.canUseAuthenticatedEndpoints
+}