WIP - rebase me

gbjk · Sep 13, 2023 · 12cc5f0 · 12cc5f0
1 parent 6caf581
commit 12cc5f0
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 7 deletions.
diff --git a/exchanges/bitfinex/bitfinex_test.go b/exchanges/bitfinex/bitfinex_test.go
@@ -53,9 +53,16 @@ func TestMain(m *testing.M) {
 	if err != nil {
 		log.Fatal("Bitfinex setup error", err)
 	}
+	b.Websocket.Enable()
+	err = b.WsConnect()
+	if err != nil {
+		log.Fatal("Bitfinex setup error", err)
+	}
 	b.SetCredentials(apiKey, apiSecret, "", "", "", "")
 	if !b.Enabled || b.API.AuthenticatedSupport ||
-		b.Verbose || b.Websocket.IsEnabled() || len(b.BaseCurrencies) < 1 {
+		b.Verbose ||
+		//b.Websocket.IsEnabled() ||
+		len(b.BaseCurrencies) < 1 {
 		log.Fatal("Bitfinex Setup values not set correctly")
 	}
 
@@ -87,6 +94,33 @@ func TestStart(t *testing.T) {
 	testWg.Wait()
 }
 
+// TestWebsocketSubscribe tests returning a message with an id
+func TestWebsocketSubscribe(t *testing.T) {
+	err := b.Subscribe([]stream.ChannelSubscription{
+		{
+			Channel:  wsTicker,
+			Currency: currency.NewPairWithDelimiter("BTC", "USDT", "-"),
+			Params: map[string]interface{
+				"symbol":"tWIBBLE",
+			},
+		},
+	})
+	if err != nil {
+		t.Error(err)
+	}
+	time.Sleep(time.Second * 5)
+	/*
+		err = b.ReSubscribe([]stream.ChannelSubscription{
+			{
+				Channel:  wsT,
+				Currency: currency.NewPairWithDelimiter("BTC", "USDT", "-"),
+			},
+		})
+		if err != nil {
+			t.Error(err)
+		}
+	*/
+}
 func TestGetV2MarginFunding(t *testing.T) {
 	t.Parallel()
 	sharedtestvalues.SkipTestIfCredentialsUnset(t, b)

diff --git a/exchanges/bitfinex/bitfinex_websocket.go b/exchanges/bitfinex/bitfinex_websocket.go
@@ -1526,7 +1526,7 @@ func (b *Bitfinex) WsUpdateOrderbook(p currency.Pair, assetType asset.Item, book
 // GenerateDefaultSubscriptions Adds default subscriptions to websocket to be handled by ManageSubscriptions()
 func (b *Bitfinex) GenerateDefaultSubscriptions() ([]stream.ChannelSubscription, error) {
 	var wsPairFormat = currency.PairFormat{Uppercase: true}
-	var channels = []string{wsBook, wsTrades, wsTicker, wsCandles}
+	var channels = []string{} //wsBook, wsTrades, wsTicker, wsCandles}
 
 	var subscriptions []stream.ChannelSubscription
 	assets := b.GetAssetTypes(true)
@@ -1561,6 +1561,7 @@ func (b *Bitfinex) GenerateDefaultSubscriptions() ([]stream.ChannelSubscription,
 					formattedPair = wsPairFormat.Format(enabledPairs[k])
 				}
 
+				// TODO - This should not be here in DefSubs
 				if channels[j] == wsCandles {
 					// TODO: Add ability to select timescale && funding period
 					fundingPeriod := ""
@@ -1587,6 +1588,7 @@ func (b *Bitfinex) GenerateDefaultSubscriptions() ([]stream.ChannelSubscription,
 
 // Subscribe sends a websocket message to receive data from the channel
 func (b *Bitfinex) Subscribe(channelsToSubscribe []stream.ChannelSubscription) error {
+	// TODO: This should be done once only
 	checksum := make(map[string]interface{})
 	checksum["event"] = "conf"
 	checksum["flags"] = bitfinexChecksumFlag + bitfinexWsSequenceFlag
@@ -1607,9 +1609,11 @@ func (b *Bitfinex) Subscribe(channelsToSubscribe []stream.ChannelSubscription) e
 				req[k] = v
 			}
 		}
-		if channelsToSubscribe[i].Channel == wsBook {
-			req["subId"] = strconv.Itoa(int(b.Websocket.Conn.GenerateMessageID(false)))
-		}
+		req["subId"] = strconv.Itoa(int(b.Websocket.Conn.GenerateMessageID(false)))
+		/*
+			if channelsToSubscribe[i].Channel == wsBook {
+			}
+		*/
 
 		key, err := keyForSub("subscribe:"+channelsToSubscribe[i].Channel, req)
 		if err != nil {
@@ -2060,7 +2064,7 @@ func keyForSub(prefix string, r map[string]interface{}) (key string, err error)
 	}
 
 	if s, ok := r[subKey].(string); !ok {
-		err = fmt.Errorf("error converting %s to string in keyForSub: %w", subKey, r[subKey])
+		err = fmt.Errorf("error converting %s to string in keyForSub: %v", subKey, r[subKey])
 	} else {
 		key = key + ":" + s
 	}

diff --git a/exchanges/stream/websocket.go b/exchanges/stream/websocket.go
@@ -208,7 +208,7 @@ func (w *Websocket) SetupNewConnection(c ConnectionSetup) error {
 		ExchangeName:      w.exchangeName,
 		URL:               connectionURL,
 		ProxyURL:          w.GetProxyAddress(),
-		Verbose:           w.verbose,
+		Verbose:           true, // w.verbose,
 		ResponseMaxLimit:  c.ResponseMaxLimit,
 		Traffic:           w.TrafficAlert,
 		readMessageErrors: w.ReadMessageErrors,