Template patch testing

cranktakular · Nov 5, 2024 · 3eb15db · 3eb15db
1 parent 3f6976c
commit 3eb15db
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 16 deletions.
diff --git a/exchanges/coinbasepro/coinbasepro_test.go b/exchanges/coinbasepro/coinbasepro_test.go
@@ -1526,10 +1526,11 @@ func TestCancelPendingFuturesSweep(t *testing.T) {
 func TestWsAuth(t *testing.T) {
 	t.Parallel()
 	p := currency.Pairs{testPair}
-	for _, a := range c.GetAssetTypes(true) {
-		require.NoError(t, c.CurrencyPairs.StorePairs(a, p, false))
-		require.NoError(t, c.CurrencyPairs.StorePairs(a, p, true))
-	}
+	// This for loop will prevent an error if the template.go file isn't patched
+	// for _, a := range c.GetAssetTypes(true) {
+	// 	require.NoError(t, c.CurrencyPairs.StorePairs(a, p, false))
+	// 	require.NoError(t, c.CurrencyPairs.StorePairs(a, p, true))
+	// }
 	if c.Websocket.IsEnabled() && !c.API.AuthenticatedWebsocketSupport || !sharedtestvalues.AreAPICredentialsSet(c) {
 		t.Skip(stream.ErrWebsocketNotEnabled.Error())
 	}

diff --git a/exchanges/coinbasepro/coinbasepro_websocket.go b/exchanges/coinbasepro/coinbasepro_websocket.go
@@ -54,11 +54,11 @@ var defaultSubscriptions = subscription.List{
 	// Subscriptions to status return an "authentication failure" error, despite the endpoint not being authenticated
 	// and other authenticated channels working fine.
 	{Enabled: false, Channel: "status"},
-	{Enabled: true, Asset: asset.Spot, Channel: subscription.TickerChannel},
-	{Enabled: true, Asset: asset.Spot, Channel: subscription.CandlesChannel},
-	{Enabled: true, Asset: asset.Spot, Channel: subscription.AllTradesChannel},
-	{Enabled: true, Asset: asset.Spot, Channel: subscription.OrderbookChannel},
-	{Enabled: true, Channel: subscription.MyAccountChannel, Authenticated: true},
+	{Enabled: false, Asset: asset.Spot, Channel: subscription.TickerChannel},
+	{Enabled: false, Asset: asset.Spot, Channel: subscription.CandlesChannel},
+	{Enabled: false, Asset: asset.Spot, Channel: subscription.AllTradesChannel},
+	{Enabled: false, Asset: asset.Spot, Channel: subscription.OrderbookChannel},
+	{Enabled: true, Asset: asset.All, Channel: subscription.MyAccountChannel, Authenticated: true},
 	{Enabled: false, Asset: asset.Spot, Channel: "ticker_batch"},
 	/* Not Implemented:
 	{Enabled: false, Asset: asset.Spot, Channel: "futures_balance_summary", Authenticated: true},
@@ -523,7 +523,7 @@ func base64URLEncode(b []byte) string {
 func (c *CoinbasePro) checkSubscriptions() {
 	for _, s := range c.Config.Features.Subscriptions {
 		switch s.Channel {
-		case "heartbeat", "level2_batch", "matches":
+		case "level2_batch", "matches":
 			c.Config.Features.Subscriptions = defaultSubscriptions.Clone()
 			c.Features.Subscriptions = c.Config.Features.Subscriptions.Enabled()
 			return

diff --git a/exchanges/subscription/template.go b/exchanges/subscription/template.go
@@ -104,12 +104,12 @@ func expandTemplate(e iExchange, s *Subscription, ap assetPairs, assets asset.It
 
 	subs := List{}
 
-	if len(s.Pairs) != 0 {
-		// We deliberately do not check Availability of sub Pairs because users have edge cases to subscribe to non-existent pairs
-		for a := range ap {
-			ap[a] = s.Pairs
-		}
-	}
+	// if len(s.Pairs) != 0 {
+	// 	// We deliberately do not check Availability of sub Pairs because users have edge cases to subscribe to non-existent pairs
+	// 	for a := range ap {
+	// 		ap[a] = s.Pairs
+	// 	}
+	// }
 
 	switch s.Asset {
 	case asset.All:
@@ -125,6 +125,15 @@ func expandTemplate(e iExchange, s *Subscription, ap assetPairs, assets asset.It
 		}
 	}
 
+	if len(s.Pairs) != 0 {
+		for a, pairs := range subCtx.AssetPairs {
+			if err := pairs.ContainsAll(s.Pairs, true); err != nil { //nolint:govet // Shadow, or gocritic will complain sloppyReassign
+				return nil, err
+			}
+			subCtx.AssetPairs[a] = s.Pairs
+		}
+	}
+
 	buf := &bytes.Buffer{}
 	if err := t.Execute(buf, subCtx); err != nil { //nolint:govet // Shadow, or gocritic will complain sloppyReassign
 		return nil, err