bitstamp support for all enabled pairs in the config (#136)

This commit is contained in:
Ermal Guni
2018-06-12 00:25:23 +02:00
committed by Adrian Gallagher
parent f100872340
commit e68b7d7e0e

View File

@@ -1,7 +1,10 @@
package bitstamp
import (
"errors"
"fmt"
"log"
"strings"
"github.com/thrasher-/gocryptotrader/common"
"github.com/toorop/go-pusher"
@@ -25,23 +28,42 @@ const (
BitstampPusherKey = "de504dc5763aeef9ff52"
)
// findPairFromChannel extracts the capitalized trading pair from the channel and returns it only if enabled in the config
func (b *Bitstamp) findPairFromChannel(channelName string) (string, error) {
split := strings.Split(channelName, "_")
tradingPair := strings.ToUpper(split[len(split)-1])
for _, enabledPair := range b.EnabledPairs {
if enabledPair == tradingPair {
return tradingPair, nil
}
}
return "", errors.New("Could not find trading pair")
}
// PusherClient starts the push mechanism
func (b *Bitstamp) PusherClient() {
for b.Enabled && b.Websocket {
// hold the mapping of channel:tradingPair in order not to always compute it
seenTradingPairs := map[string]string{}
pusherClient, err := pusher.NewClient(BitstampPusherKey)
if err != nil {
log.Printf("%s Unable to connect to Websocket. Error: %s\n", b.GetName(), err)
continue
}
err = pusherClient.Subscribe("live_trades")
if err != nil {
log.Printf("%s Websocket Trade subscription error: %s\n", b.GetName(), err)
}
for _, pair := range b.EnabledPairs {
err = pusherClient.Subscribe(fmt.Sprintf("live_trades_%s", strings.ToLower(pair)))
if err != nil {
log.Printf("%s Websocket Trade subscription error: %s\n", b.GetName(), err)
}
err = pusherClient.Subscribe("order_book")
if err != nil {
log.Printf("%s Websocket Trade subscription error: %s\n", b.GetName(), err)
err = pusherClient.Subscribe(fmt.Sprintf("order_book_%s", strings.ToLower(pair)))
if err != nil {
log.Printf("%s Websocket Trade subscription error: %s\n", b.GetName(), err)
}
}
dataChannelTrade, err := pusherClient.Bind("data")
@@ -49,6 +71,7 @@ func (b *Bitstamp) PusherClient() {
log.Printf("%s Websocket Bind error: %s\n", b.GetName(), err)
continue
}
tradeChannelTrade, err := pusherClient.Bind("trade")
if err != nil {
log.Printf("%s Websocket Bind error: %s\n", b.GetName(), err)
@@ -62,16 +85,45 @@ func (b *Bitstamp) PusherClient() {
case data := <-dataChannelTrade:
result := PusherOrderbook{}
err := common.JSONDecode([]byte(data.Data), &result)
var channelTradingPair string
var ok bool
if channelTradingPair, ok = seenTradingPairs[data.Channel]; !ok {
if foundTradingPair, noPair := b.findPairFromChannel(data.Channel); noPair == nil {
seenTradingPairs[data.Channel] = foundTradingPair
} else {
log.Printf("%s Pair from Channel: %s does not seem to be enabled or found", b.GetName(), data.Channel)
continue
}
}
log.Printf("%s Pusher: received ticker for Pair: %s\n", b.GetName(), channelTradingPair)
if err != nil {
log.Println(err)
}
case trade := <-tradeChannelTrade:
result := PusherTrade{}
err := common.JSONDecode([]byte(trade.Data), &result)
if err != nil {
log.Println(err)
}
log.Printf("%s Pusher trade: Price: %f Amount: %f\n", b.GetName(), result.Price, result.Amount)
var channelTradingPair string
var ok bool
if channelTradingPair, ok = seenTradingPairs[trade.Channel]; !ok {
if foundTradingPair, noPair := b.findPairFromChannel(trade.Channel); noPair == nil {
seenTradingPairs[trade.Channel] = foundTradingPair
} else {
log.Printf("%s LiveTrade Pair from Channel: %s does not seem to be enabled or found", b.GetName(), trade.Channel)
continue
}
}
log.Println(trade.Channel)
log.Printf("%s Pusher trade: Pair: %s Price: %f Amount: %f\n", b.GetName(), channelTradingPair, result.Price, result.Amount)
}
}
}