Merge branch 'master' into engine

2026-05-29 15:10:37 +00:00 · 2019-08-09 15:46:24 +10:00
parent e8c9a9a2a4 2078ba907f
commit 8ecd8a0c16
353 changed files with 4966 additions and 4196 deletions
--- a/exchanges/binance/README.md
+++ b/exchanges/binance/README.md
@@ -1,13 +1,13 @@
 # GoCryptoTrader package Binance

-<img src="https://github.com/thrasher-/gocryptotrader/blob/master/web/src/assets/page-logo.png?raw=true" width="350px" height="350px" hspace="70">
+<img src="https://github.com/thrasher-corp/gocryptotrader/blob/master/web/src/assets/page-logo.png?raw=true" width="350px" height="350px" hspace="70">


-[![Build Status](https://travis-ci.org/thrasher-/gocryptotrader.svg?branch=master)](https://travis-ci.org/thrasher-/gocryptotrader)
-[![Software License](https://img.shields.io/badge/License-MIT-orange.svg?style=flat-square)](https://github.com/thrasher-/gocryptotrader/blob/master/LICENSE)
-[![GoDoc](https://godoc.org/github.com/thrasher-/gocryptotrader?status.svg)](https://godoc.org/github.com/thrasher-/gocryptotrader/exchanges/binance)
-[![Coverage Status](http://codecov.io/github/thrasher-/gocryptotrader/coverage.svg?branch=master)](http://codecov.io/github/thrasher-/gocryptotrader?branch=master)
-[![Go Report Card](https://goreportcard.com/badge/github.com/thrasher-/gocryptotrader)](https://goreportcard.com/report/github.com/thrasher-/gocryptotrader)
+[![Build Status](https://travis-ci.org/thrasher-corp/gocryptotrader.svg?branch=master)](https://travis-ci.org/thrasher-corp/gocryptotrader)
+[![Software License](https://img.shields.io/badge/License-MIT-orange.svg?style=flat-square)](https://github.com/thrasher-corp/gocryptotrader/blob/master/LICENSE)
+[![GoDoc](https://godoc.org/github.com/thrasher-corp/gocryptotrader?status.svg)](https://godoc.org/github.com/thrasher-corp/gocryptotrader/exchanges/binance)
+[![Coverage Status](http://codecov.io/github/thrasher-corp/gocryptotrader/coverage.svg?branch=master)](http://codecov.io/github/thrasher-corp/gocryptotrader?branch=master)
+[![Go Report Card](https://goreportcard.com/badge/github.com/thrasher-corp/gocryptotrader)](https://goreportcard.com/report/github.com/thrasher-corp/gocryptotrader)


 This binance package is part of the GoCryptoTrader codebase.
@@ -27,7 +27,7 @@ Join our slack to discuss all things related to GoCryptoTrader! [GoCryptoTrader

 ### How to enable

-+ [Enable via configuration](https://github.com/thrasher-/gocryptotrader/tree/master/config#enable-exchange-via-config-example)
+ [Enable via configuration](https://github.com/thrasher-corp/gocryptotrader/tree/master/config#enable-exchange-via-config-example)

 + Individual package example below:

@@ -128,12 +128,12 @@ When submitting a PR, please abide by our coding guidelines:

 + Code must adhere to the official Go [formatting](https://golang.org/doc/effective_go.html#formatting) guidelines (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)).
 + Code must be documented adhering to the official Go [commentary](https://golang.org/doc/effective_go.html#commentary) guidelines.
-+ Code must adhere to our [coding style](https://github.com/thrasher-/gocryptotrader/blob/master/doc/coding_style.md).
+ Code must adhere to our [coding style](https://github.com/thrasher-corp/gocryptotrader/blob/master/doc/coding_style.md).
 + Pull requests need to be based on and opened against the `master` branch.

 ## Donations

-<img src="https://github.com/thrasher-/gocryptotrader/blob/master/web/src/assets/donate.png?raw=true" hspace="70">
+<img src="https://github.com/thrasher-corp/gocryptotrader/blob/master/web/src/assets/donate.png?raw=true" hspace="70">

 If this framework helped you in any way, or you would like to support the developers working on it, please donate Bitcoin to:

--- a/exchanges/binance/binance.go
+++ b/exchanges/binance/binance.go
@@ -11,14 +11,14 @@ import (
 	"strings"
 	"time"

-	"github.com/gorilla/websocket"
-	"github.com/thrasher-/gocryptotrader/common"
-	"github.com/thrasher-/gocryptotrader/common/convert"
-	"github.com/thrasher-/gocryptotrader/common/crypto"
-	"github.com/thrasher-/gocryptotrader/currency"
-	exchange "github.com/thrasher-/gocryptotrader/exchanges"
-	"github.com/thrasher-/gocryptotrader/exchanges/asset"
-	log "github.com/thrasher-/gocryptotrader/logger"
+	"github.com/thrasher-corp/gocryptotrader/common"
+	"github.com/thrasher-corp/gocryptotrader/common/convert"
+	"github.com/thrasher-corp/gocryptotrader/common/crypto"
+	"github.com/thrasher-corp/gocryptotrader/currency"
+	exchange "github.com/thrasher-corp/gocryptotrader/exchanges"
+	"github.com/thrasher-corp/gocryptotrader/exchanges/asset"
+	"github.com/thrasher-corp/gocryptotrader/exchanges/wshandler"
+	log "github.com/thrasher-corp/gocryptotrader/logger"
 )

 const (
@@ -65,7 +65,7 @@ const (
 // Binance is the overarching type across the Bithumb package
 type Binance struct {
 	exchange.Base
-	WebsocketConn *websocket.Conn
+	WebsocketConn *wshandler.WebsocketConnection

 	// Valid string list that is required by the exchange
 	validLimits    []int
--- a/exchanges/binance/binance_test.go
+++ b/exchanges/binance/binance_test.go
@@ -3,11 +3,11 @@ package binance
 import (
 	"testing"

-	"github.com/thrasher-/gocryptotrader/common"
-	"github.com/thrasher-/gocryptotrader/config"
-	"github.com/thrasher-/gocryptotrader/currency"
-	exchange "github.com/thrasher-/gocryptotrader/exchanges"
-	"github.com/thrasher-/gocryptotrader/exchanges/asset"
+	"github.com/thrasher-corp/gocryptotrader/common"
+	"github.com/thrasher-corp/gocryptotrader/config"
+	"github.com/thrasher-corp/gocryptotrader/currency"
+	exchange "github.com/thrasher-corp/gocryptotrader/exchanges"
+	"github.com/thrasher-corp/gocryptotrader/exchanges/asset"
 )

 // Please supply your own keys here for due diligence testing
--- a/exchanges/binance/binance_types.go
+++ b/exchanges/binance/binance_types.go
@@ -3,7 +3,7 @@ package binance
 import (
 	"encoding/json"

-	"github.com/thrasher-/gocryptotrader/currency"
+	"github.com/thrasher-corp/gocryptotrader/currency"
 )

 // Response holds basic binance api response data
--- a/exchanges/binance/binance_websocket.go
+++ b/exchanges/binance/binance_websocket.go
@@ -4,18 +4,17 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"net/url"
 	"strconv"
 	"strings"
 	"sync"
 	"time"

 	"github.com/gorilla/websocket"
-	"github.com/thrasher-/gocryptotrader/common"
-	"github.com/thrasher-/gocryptotrader/currency"
-	exchange "github.com/thrasher-/gocryptotrader/exchanges"
-	"github.com/thrasher-/gocryptotrader/exchanges/asset"
-	"github.com/thrasher-/gocryptotrader/exchanges/orderbook"
+	"github.com/thrasher-corp/gocryptotrader/common"
+	"github.com/thrasher-corp/gocryptotrader/currency"
+	"github.com/thrasher-corp/gocryptotrader/exchanges/asset"
+	"github.com/thrasher-corp/gocryptotrader/exchanges/orderbook"
+	"github.com/thrasher-corp/gocryptotrader/exchanges/wshandler"
 )

 const (
@@ -69,7 +68,7 @@ func (b *Binance) UpdateLocalCache(ob *WebsocketDepthStream) error {
 	ID, ok := lastUpdateID[ob.Pair]
 	if !ok {
 		m.Unlock()
-		return errors.New("binance_websocket.go - Unable to find lastUpdateID")
+		return fmt.Errorf("%v - Unable to find lastUpdateID", b.Name)
 	}

 	if ob.LastUpdateID+1 <= ID || ID >= ob.LastUpdateID+1 {
@@ -123,10 +122,10 @@ func (b *Binance) UpdateLocalCache(ob *WebsocketDepthStream) error {
 // WSConnect intiates a websocket connection
 func (b *Binance) WSConnect() error {
 	if !b.Websocket.IsEnabled() || !b.IsEnabled() {
-		return errors.New(exchange.WebsocketNotEnabled)
+		return errors.New(wshandler.WebsocketNotEnabled)
 	}

-	var Dialer websocket.Dialer
+	var dialer websocket.Dialer
 	var err error

 	pairs := b.GetEnabledPairs(asset.Spot).Strings()
@@ -152,18 +151,6 @@ func (b *Binance) WSConnect() error {
 		kline +
 		"/" +
 		depth
-
-	if b.Websocket.GetProxyAddress() != "" {
-		var u *url.URL
-		u, err = url.Parse(b.Websocket.GetProxyAddress())
-		if err != nil {
-			return fmt.Errorf("binance_websocket.go - Unable to connect to parse proxy address. Error: %s",
-				err)
-		}
-
-		Dialer.Proxy = http.ProxyURL(u)
-	}
-
 	for _, ePair := range b.GetEnabledPairs(asset.Spot) {
 		err = b.SeedLocalCache(ePair)
 		if err != nil {
@@ -171,9 +158,11 @@ func (b *Binance) WSConnect() error {
 		}
 	}

-	b.WebsocketConn, _, err = Dialer.Dial(wsurl, http.Header{})
+	b.WebsocketConn.URL = wsurl
+	err = b.WebsocketConn.Dial(&dialer, http.Header{})
 	if err != nil {
-		return fmt.Errorf("binance_websocket.go - Unable to connect to Websocket. Error: %s",
+		return fmt.Errorf("%v - Unable to connect to Websocket. Error: %s",
+			b.Name,
 			err)
 	}

@@ -182,18 +171,6 @@ func (b *Binance) WSConnect() error {
 	return nil
 }

-// WSReadData reads from the websocket connection and returns the response
-func (b *Binance) WSReadData() (exchange.WebsocketResponse, error) {
-	msgType, resp, err := b.WebsocketConn.ReadMessage()
-
-	if err != nil {
-		return exchange.WebsocketResponse{}, err
-	}
-
-	b.Websocket.TrafficAlert <- struct{}{}
-	return exchange.WebsocketResponse{Type: msgType, Raw: resp}, nil
-}
-
 // WsHandleData handles websocket data from WsReadData
 func (b *Binance) WsHandleData() {
 	b.Websocket.Wg.Add(1)
@@ -208,134 +185,132 @@ func (b *Binance) WsHandleData() {
 			return

 		default:
-			read, err := b.WSReadData()
+			read, err := b.WebsocketConn.ReadMessage()
 			if err != nil {
 				b.Websocket.DataHandler <- err
 				return
 			}
-
-			if read.Type == websocket.TextMessage {
-				multiStreamData := MultiStreamData{}
-				err = common.JSONDecode(read.Raw, &multiStreamData)
+			b.Websocket.TrafficAlert <- struct{}{}
+			var multiStreamData MultiStreamData
+			err = common.JSONDecode(read.Raw, &multiStreamData)
+			if err != nil {
+				b.Websocket.DataHandler <- fmt.Errorf("%v - Could not load multi stream data: %s",
+					b.Name,
+					read.Raw)
+				continue
+			}
+			streamType := strings.Split(multiStreamData.Stream, "@")
+			switch streamType[1] {
+			case "trade":
+				trade := TradeStream{}
+				err := common.JSONDecode(multiStreamData.Data, &trade)
 				if err != nil {
-					b.Websocket.DataHandler <- fmt.Errorf("binance_websocket.go - Could not load multi stream data: %s",
-						string(read.Raw))
+					b.Websocket.DataHandler <- fmt.Errorf("%v - Could not unmarshal trade data: %s",
+						b.Name,
+						err)
 					continue
 				}
-				streamType := strings.Split(multiStreamData.Stream, "@")
-				switch streamType[1] {
-				case "trade":
-					trade := TradeStream{}

-					err := common.JSONDecode(multiStreamData.Data, &trade)
-					if err != nil {
-						b.Websocket.DataHandler <- fmt.Errorf("binance_websocket.go - Could not unmarshal trade data: %s",
-							err)
-						continue
-					}
-
-					price, err := strconv.ParseFloat(trade.Price, 64)
-					if err != nil {
-						b.Websocket.DataHandler <- fmt.Errorf("binance_websocket.go - price conversion error: %s",
-							err)
-						continue
-					}
-
-					amount, err := strconv.ParseFloat(trade.Quantity, 64)
-					if err != nil {
-						b.Websocket.DataHandler <- fmt.Errorf("binance_websocket.go - amount conversion error: %s",
-							err)
-						continue
-					}
-
-					b.Websocket.DataHandler <- exchange.TradeData{
-						CurrencyPair: currency.NewPairFromString(trade.Symbol),
-						Timestamp:    time.Unix(0, trade.TimeStamp*int64(time.Millisecond)),
-						Price:        price,
-						Amount:       amount,
-						Exchange:     b.GetName(),
-						AssetType:    asset.Spot,
-						Side:         trade.EventType,
-					}
-					continue
-				case "ticker":
-					t := TickerStream{}
-
-					err := common.JSONDecode(multiStreamData.Data, &t)
-					if err != nil {
-						b.Websocket.DataHandler <- fmt.Errorf("binance_websocket.go - Could not convert to a TickerStream structure %s",
-							err.Error())
-						continue
-					}
-
-					var wsTicker exchange.TickerData
-
-					wsTicker.Timestamp = time.Unix(t.EventTime/1000, 0)
-					wsTicker.Pair = currency.NewPairFromString(t.Symbol)
-					wsTicker.AssetType = asset.Spot
-					wsTicker.Exchange = b.GetName()
-					wsTicker.ClosePrice, _ = strconv.ParseFloat(t.CurrDayClose, 64)
-					wsTicker.Quantity, _ = strconv.ParseFloat(t.TotalTradedVolume, 64)
-					wsTicker.OpenPrice, _ = strconv.ParseFloat(t.OpenPrice, 64)
-					wsTicker.HighPrice, _ = strconv.ParseFloat(t.HighPrice, 64)
-					wsTicker.LowPrice, _ = strconv.ParseFloat(t.LowPrice, 64)
-
-					b.Websocket.DataHandler <- wsTicker
-
-					continue
-				case "kline":
-					kline := KlineStream{}
-
-					err := common.JSONDecode(multiStreamData.Data, &kline)
-					if err != nil {
-						b.Websocket.DataHandler <- fmt.Errorf("binance_websocket.go - Could not convert to a KlineStream structure %s",
-							err)
-						continue
-					}
-
-					var wsKline exchange.KlineData
-
-					wsKline.Timestamp = time.Unix(0, kline.EventTime)
-					wsKline.Pair = currency.NewPairFromString(kline.Symbol)
-					wsKline.AssetType = asset.Spot
-					wsKline.Exchange = b.GetName()
-					wsKline.StartTime = time.Unix(0, kline.Kline.StartTime)
-					wsKline.CloseTime = time.Unix(0, kline.Kline.CloseTime)
-					wsKline.Interval = kline.Kline.Interval
-					wsKline.OpenPrice, _ = strconv.ParseFloat(kline.Kline.OpenPrice, 64)
-					wsKline.ClosePrice, _ = strconv.ParseFloat(kline.Kline.ClosePrice, 64)
-					wsKline.HighPrice, _ = strconv.ParseFloat(kline.Kline.HighPrice, 64)
-					wsKline.LowPrice, _ = strconv.ParseFloat(kline.Kline.LowPrice, 64)
-					wsKline.Volume, _ = strconv.ParseFloat(kline.Kline.Volume, 64)
-
-					b.Websocket.DataHandler <- wsKline
-					continue
-				case "depth":
-					depth := WebsocketDepthStream{}
-
-					err := common.JSONDecode(multiStreamData.Data, &depth)
-					if err != nil {
-						b.Websocket.DataHandler <- fmt.Errorf("binance_websocket.go - Could not convert to depthStream structure %s",
-							err)
-						continue
-					}
-
-					err = b.UpdateLocalCache(&depth)
-					if err != nil {
-						b.Websocket.DataHandler <- fmt.Errorf("binance_websocket.go - UpdateLocalCache error: %s",
-							err)
-						continue
-					}
-
-					currencyPair := currency.NewPairFromString(depth.Pair)
-
-					b.Websocket.DataHandler <- exchange.WebsocketOrderbookUpdate{
-						Pair:     currencyPair,
-						Asset:    asset.Spot,
-						Exchange: b.GetName(),
-					}
+				price, err := strconv.ParseFloat(trade.Price, 64)
+				if err != nil {
+					b.Websocket.DataHandler <- fmt.Errorf("%v - price conversion error: %s",
+						b.Name,
+						err)
 					continue
 				}
+
+				amount, err := strconv.ParseFloat(trade.Quantity, 64)
+				if err != nil {
+					b.Websocket.DataHandler <- fmt.Errorf("%v - amount conversion error: %s",
+						b.Name,
+						err)
+					continue
+				}
+
+				b.Websocket.DataHandler <- wshandler.TradeData{
+					CurrencyPair: currency.NewPairFromString(trade.Symbol),
+					Timestamp:    time.Unix(0, trade.TimeStamp),
+					Price:        price,
+					Amount:       amount,
+					Exchange:     b.GetName(),
+					AssetType:    "SPOT",
+					Side:         trade.EventType,
+				}
+				continue
+			case "ticker":
+				t := TickerStream{}
+				err := common.JSONDecode(multiStreamData.Data, &t)
+				if err != nil {
+					b.Websocket.DataHandler <- fmt.Errorf("%v - Could not convert to a TickerStream structure %s",
+						b.Name,
+						err.Error())
+					continue
+				}
+
+				var wsTicker wshandler.TickerData
+				wsTicker.Timestamp = time.Unix(t.EventTime/1000, 0)
+				wsTicker.Pair = currency.NewPairFromString(t.Symbol)
+				wsTicker.AssetType = asset.Spot
+				wsTicker.Exchange = b.GetName()
+				wsTicker.ClosePrice, _ = strconv.ParseFloat(t.CurrDayClose, 64)
+				wsTicker.Quantity, _ = strconv.ParseFloat(t.TotalTradedVolume, 64)
+				wsTicker.OpenPrice, _ = strconv.ParseFloat(t.OpenPrice, 64)
+				wsTicker.HighPrice, _ = strconv.ParseFloat(t.HighPrice, 64)
+				wsTicker.LowPrice, _ = strconv.ParseFloat(t.LowPrice, 64)
+
+				b.Websocket.DataHandler <- wsTicker
+
+				continue
+			case "kline":
+				kline := KlineStream{}
+				err := common.JSONDecode(multiStreamData.Data, &kline)
+				if err != nil {
+					b.Websocket.DataHandler <- fmt.Errorf("%v - Could not convert to a KlineStream structure %s",
+						b.Name,
+						err)
+					continue
+				}
+
+				var wsKline wshandler.KlineData
+				wsKline.Timestamp = time.Unix(0, kline.EventTime)
+				wsKline.Pair = currency.NewPairFromString(kline.Symbol)
+				wsKline.AssetType = asset.Spot
+				wsKline.Exchange = b.GetName()
+				wsKline.StartTime = time.Unix(0, kline.Kline.StartTime)
+				wsKline.CloseTime = time.Unix(0, kline.Kline.CloseTime)
+				wsKline.Interval = kline.Kline.Interval
+				wsKline.OpenPrice, _ = strconv.ParseFloat(kline.Kline.OpenPrice, 64)
+				wsKline.ClosePrice, _ = strconv.ParseFloat(kline.Kline.ClosePrice, 64)
+				wsKline.HighPrice, _ = strconv.ParseFloat(kline.Kline.HighPrice, 64)
+				wsKline.LowPrice, _ = strconv.ParseFloat(kline.Kline.LowPrice, 64)
+				wsKline.Volume, _ = strconv.ParseFloat(kline.Kline.Volume, 64)
+				b.Websocket.DataHandler <- wsKline
+				continue
+			case "depth":
+				depth := WebsocketDepthStream{}
+				err := common.JSONDecode(multiStreamData.Data, &depth)
+				if err != nil {
+					b.Websocket.DataHandler <- fmt.Errorf("%v - Could not convert to depthStream structure %s",
+						b.Name,
+						err)
+					continue
+				}
+
+				err = b.UpdateLocalCache(&depth)
+				if err != nil {
+					b.Websocket.DataHandler <- fmt.Errorf("%v - UpdateLocalCache error: %s",
+						b.Name,
+						err)
+					continue
+				}
+
+				currencyPair := currency.NewPairFromString(depth.Pair)
+				b.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
+					Pair:     currencyPair,
+					Asset:    "SPOT",
+					Exchange: b.GetName(),
+				}
+				continue
 			}
 		}
 	}
--- a/exchanges/binance/binance_wrapper.go
+++ b/exchanges/binance/binance_wrapper.go
@@ -8,15 +8,16 @@ import (
 	"sync"
 	"time"

-	"github.com/thrasher-/gocryptotrader/common"
-	"github.com/thrasher-/gocryptotrader/config"
-	"github.com/thrasher-/gocryptotrader/currency"
-	exchange "github.com/thrasher-/gocryptotrader/exchanges"
-	"github.com/thrasher-/gocryptotrader/exchanges/asset"
-	"github.com/thrasher-/gocryptotrader/exchanges/orderbook"
-	"github.com/thrasher-/gocryptotrader/exchanges/request"
-	"github.com/thrasher-/gocryptotrader/exchanges/ticker"
-	log "github.com/thrasher-/gocryptotrader/logger"
+	"github.com/thrasher-corp/gocryptotrader/common"
+	"github.com/thrasher-corp/gocryptotrader/config"
+	"github.com/thrasher-corp/gocryptotrader/currency"
+	exchange "github.com/thrasher-corp/gocryptotrader/exchanges"
+	"github.com/thrasher-corp/gocryptotrader/exchanges/asset"
+	"github.com/thrasher-corp/gocryptotrader/exchanges/orderbook"
+	"github.com/thrasher-corp/gocryptotrader/exchanges/request"
+	"github.com/thrasher-corp/gocryptotrader/exchanges/ticker"
+	"github.com/thrasher-corp/gocryptotrader/exchanges/wshandler"
+	log "github.com/thrasher-corp/gocryptotrader/logger"
 )

 // GetDefaultConfig returns a default exchange config
@@ -89,12 +90,14 @@ func (b *Binance) SetDefaults() {

 	b.API.Endpoints.URLDefault = apiURL
 	b.API.Endpoints.URL = b.API.Endpoints.URLDefault
-	b.WebsocketInit()
+	b.Websocket = wshandler.New()
 	b.API.Endpoints.WebsocketURL = binanceDefaultWebsocketURL
-	b.Websocket.Functionality = exchange.WebsocketTradeDataSupported |
-		exchange.WebsocketTickerSupported |
-		exchange.WebsocketKlineSupported |
-		exchange.WebsocketOrderbookSupported
+	b.Websocket.Functionality = wshandler.WebsocketTradeDataSupported |
+		wshandler.WebsocketTickerSupported |
+		wshandler.WebsocketKlineSupported |
+		wshandler.WebsocketOrderbookSupported
+	b.WebsocketResponseMaxLimit = exchange.DefaultWebsocketResponseMaxLimit
+	b.WebsocketResponseCheckTimeout = exchange.DefaultWebsocketResponseCheckTimeout
 }

 // Setup takes in the supplied exchange configuration details and sets params
@@ -109,14 +112,28 @@ func (b *Binance) Setup(exch *config.ExchangeConfig) error {
 		return err
 	}

-	return b.WebsocketSetup(b.WSConnect,
+	err = b.Websocket.Setup(b.WSConnect,
 		nil,
 		nil,
 		exch.Name,
 		exch.Features.Enabled.Websocket,
 		exch.Verbose,
 		binanceDefaultWebsocketURL,
-		exch.API.Endpoints.WebsocketURL)
+		exch.API.Endpoints.WebsocketURL,
+		exch.API.AuthenticatedWebsocketSupport)
+	if err != nil {
+		return err
+	}
+
+	b.WebsocketConn = &wshandler.WebsocketConnection{
+		ExchangeName:         b.Name,
+		URL:                  b.Websocket.GetWebsocketURL(),
+		ProxyURL:             b.Websocket.GetProxyAddress(),
+		Verbose:              b.Verbose,
+		ResponseCheckTimeout: exch.WebsocketResponseCheckTimeout,
+		ResponseMaxLimit:     exch.WebsocketResponseMaxLimit,
+	}
+	return nil
 }

 // Start starts the Binance go routine
@@ -436,7 +453,7 @@ func (b *Binance) WithdrawFiatFundsToInternationalBank(withdrawRequest *exchange
 }

 // GetWebsocket returns a pointer to the exchange websocket
-func (b *Binance) GetWebsocket() (*exchange.Websocket, error) {
+func (b *Binance) GetWebsocket() (*wshandler.Websocket, error) {
 	return b.Websocket, nil
 }

@@ -534,18 +551,18 @@ func (b *Binance) GetOrderHistory(getOrdersRequest *exchange.GetOrdersRequest) (

 // SubscribeToWebsocketChannels appends to ChannelsToSubscribe
 // which lets websocket.manageSubscriptions handle subscribing
-func (b *Binance) SubscribeToWebsocketChannels(channels []exchange.WebsocketChannelSubscription) error {
+func (b *Binance) SubscribeToWebsocketChannels(channels []wshandler.WebsocketChannelSubscription) error {
 	return common.ErrFunctionNotSupported
 }

 // UnsubscribeToWebsocketChannels removes from ChannelsToSubscribe
 // which lets websocket.manageSubscriptions handle unsubscribing
-func (b *Binance) UnsubscribeToWebsocketChannels(channels []exchange.WebsocketChannelSubscription) error {
+func (b *Binance) UnsubscribeToWebsocketChannels(channels []wshandler.WebsocketChannelSubscription) error {
 	return common.ErrFunctionNotSupported
 }

 // GetSubscriptions returns a copied list of subscriptions
-func (b *Binance) GetSubscriptions() ([]exchange.WebsocketChannelSubscription, error) {
+func (b *Binance) GetSubscriptions() ([]wshandler.WebsocketChannelSubscription, error) {
 	return b.Websocket.GetSubscriptions(), nil
 }