retry ensureAccount only on ActivationServiceError

Eslam-Nawara · Eslam-Nawara · commit 29842b8f7367 · 2024-09-08T13:08:27.000+03:00
diff --git a/pkg/substrate_gateway/substrate_gateway.go b/pkg/substrate_gateway/substrate_gateway.go
@@ -58,9 +58,13 @@ func (g *substrateGateway) EnsureAccount(activationURL []string, termsAndConditi
 	g.mu.Lock()
 	defer g.mu.Unlock()
 	for _, url := range activationURL {
-		if info, err = g.sub.EnsureAccount(g.identity, url, termsAndConditionsLink, termsAndConditionsHash); err == nil {
-			return
+		info, err = g.sub.EnsureAccount(g.identity, url, termsAndConditionsLink, termsAndConditionsHash)
+		// check other activationURL only if EnsureAccount failed with ActivationServiceError
+		if errors.Is(err, substrate.ActivationServiceError{}) {
+			log.Debug().Str("activation url", url).Err(err).Msg("failed to EnsureAccount with ActivationServiceError")
+			continue
 		}
+		return
 	}
 	return
 }

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,13 @@ func (g *substrateGateway) EnsureAccount(activationURL []string, termsAndConditi`
`58`	`58`	`g.mu.Lock()`
`59`	`59`	`defer g.mu.Unlock()`
`60`	`60`	`for _, url := range activationURL {`
`61`		`- if info, err = g.sub.EnsureAccount(g.identity, url, termsAndConditionsLink, termsAndConditionsHash); err == nil {`
`62`		`- return`
	`61`	`+ info, err = g.sub.EnsureAccount(g.identity, url, termsAndConditionsLink, termsAndConditionsHash)`
	`62`	`+ // check other activationURL only if EnsureAccount failed with ActivationServiceError`
	`63`	`+ if errors.Is(err, substrate.ActivationServiceError{}) {`
	`64`	`+ log.Debug().Str("activation url", url).Err(err).Msg("failed to EnsureAccount with ActivationServiceError")`
	`65`	`+ continue`
`63`	`66`	`}`
	`67`	`+ return`
`64`	`68`	`}`
`65`	`69`	`return`
`66`	`70`	`}`