refactored retry

skycoin · May 20, 2019 · bebafeb · bebafeb
1 parent 6efde16
commit bebafeb
Showing 1 changed file with 18 additions and 19 deletions.
diff --git a/pkg/messaging-discovery/client/client.go b/pkg/messaging-discovery/client/client.go
@@ -128,27 +128,26 @@ func (c *httpClient) UpdateEntry(ctx context.Context, sk cipher.SecKey, e *Entry
 
 	for {
 		err = c.SetEntry(ctx, e)
+		if err == nil {
+			return nil
+		}
+		if err != ErrValidationWrongSequence {
+			e.Sequence--
+			return err
+		}
+		rE, entryErr := c.Entry(ctx, e.Static)
+		if entryErr != nil {
+			return err
+		}
+		if rE.Timestamp > e.Timestamp { // If there is a more up to date entry drop update
+			e.Sequence = rE.Sequence
+			return nil
+		}
+		e.Sequence = rE.Sequence + 1
+		err := e.Sign(sk)
 		if err != nil {
-			if err != ErrValidationWrongSequence {
-				e.Sequence--
-				return err
-			}
-			rE, entryErr := c.Entry(ctx, e.Static)
-			if entryErr != nil {
-				return err
-			}
-			if rE.Timestamp > e.Timestamp { // If there is a more up to date entry drop update
-				e.Sequence = rE.Sequence
-				return nil
-			}
-			e.Sequence = rE.Sequence + 1
-			err := e.Sign(sk)
-			if err != nil {
-				return err
-			}
-			continue
+			return err
 		}
-		return nil
 	}
 }