Fix: spread data parsing and re-subscribing to private channels

aopoltorzhicky · Oct 14, 2021 · e50843a · e50843a
1 parent 38db2c0
commit e50843a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/websocket/data.go b/websocket/data.go
@@ -157,7 +157,7 @@ type Spread struct {
 
 // UnmarshalJSON - unmarshal candle update
 func (s *Spread) UnmarshalJSON(data []byte) error {
-	raw := []interface{}{&s.Ask, &s.Bid, &s.Time, &s.AskVolume, &s.BidVolume, &s.Time}
+	raw := []interface{}{&s.Bid, &s.Ask, &s.Time, &s.AskVolume, &s.BidVolume, &s.Time}
 	return json.Unmarshal(data, &raw)
 }
 

diff --git a/websocket/kraken.go b/websocket/kraken.go
@@ -124,12 +124,18 @@ func (k *Kraken) managerThread() {
 
 func (k *Kraken) resubscribe() error {
 	for _, sub := range k.subscriptions {
-		if err := k.send(SubscriptionRequest{
-			Event:        EventSubscribe,
-			Pairs:        []string{sub.Pair},
-			Subscription: sub.Subscription,
-		}); err != nil {
-			return err
+		switch sub.Subscription.Name {
+		// Private Channels
+		case ChanOwnTrades, ChanOpenOrders:
+			return k.subscribeToPrivate(sub.Subscription.Name)
+		default:
+			if err := k.send(SubscriptionRequest{
+				Event:        EventSubscribe,
+				Pairs:        []string{sub.Pair},
+				Subscription: sub.Subscription,
+			}); err != nil {
+				return err
+			}
 		}
 	}
 	return nil