Subscriptions: Fix panic on nil Pairs on Matchable keys

gbjk · Feb 8, 2024 · 8976608 · 8976608
1 parent 18edb4f
commit 8976608
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/exchanges/kraken/kraken_test.go b/exchanges/kraken/kraken_test.go
@@ -1540,7 +1540,7 @@ func TestWsOHLC(t *testing.T) {
 	k.Websocket.AddSuccessfulSubscriptions(subscription.Subscription{
 		Key: subscription.Key{
 			Channel: krakenWsOHLC + "-5",
-			Pairs:   currency.Pairs{btcusdPair},
+			Pairs:   &currency.Pairs{btcusdPair},
 			Asset:   asset.Spot,
 		},
 		Channel: krakenWsOHLC,
@@ -1573,7 +1573,7 @@ func TestWsOrdrbook(t *testing.T) {
 	k.Websocket.AddSuccessfulSubscriptions(subscription.Subscription{
 		Key: subscription.Key{
 			Channel: krakenWsOrderbook + "-100",
-			Pairs:   currency.Pairs{btcusdPair},
+			Pairs:   &currency.Pairs{btcusdPair},
 			Asset:   asset.Spot,
 		},
 		Channel: krakenWsOrderbook,
@@ -2006,7 +2006,7 @@ func TestWsOrderbookMax10Depth(t *testing.T) {
 		k.Websocket.AddSuccessfulSubscriptions(subscription.Subscription{
 			Key: subscription.Key{
 				Channel: krakenWsOrderbook + "-10",
-				Pairs:   currency.Pairs{p},
+				Pairs:   &currency.Pairs{p},
 				Asset:   asset.Spot,
 			},
 			Channel: krakenWsOrderbook,

diff --git a/exchanges/kraken/kraken_websocket.go b/exchanges/kraken/kraken_websocket.go
@@ -186,7 +186,7 @@ func (k *Kraken) wsHandleData(respRaw []byte) error {
 			}
 		}
 
-		c := k.Websocket.GetSubscription(subscription.Key{Channel: channelName, Pairs: currency.Pairs{wsPair}, Asset: asset.Spot})
+		c := k.Websocket.GetSubscription(subscription.Key{Channel: channelName, Pairs: &currency.Pairs{wsPair}, Asset: asset.Spot})
 		if c == nil {
 			return fmt.Errorf("%w: %s %s %s", stream.ErrSubscriptionNotFound, asset.Spot, channelName, wsPair)
 		}

diff --git a/exchanges/subscription/subscription.go b/exchanges/subscription/subscription.go
@@ -98,7 +98,7 @@ func (k Key) Match(m Map) *Subscription {
 		if k.Asset != candidate.Asset {
 			continue
 		}
-		if len(*k.Pairs) == 0 && len(*candidate.Pairs) == 0 {
+		if (k.Pairs == nil || len(*k.Pairs) == 0) && (candidate.Pairs == nil || len(*candidate.Pairs) == 0) {
 			return v
 		}
 		if err := candidate.Pairs.ContainsAll(*k.Pairs, true); err == nil {