Revert "Improvements to Twitter registration DB transaction (#108)"

This reverts commit acbd122.

Author: Jeff Yanta

pkg/code/async/user/twitter.go

@@ -124,38 +124,34 @@ func (p *service) processNewTwitterRegistrations(ctx context.Context) error {
 		}
 
 		// Save the updated tipping information
-		var isRegistered bool
 		err = p.data.ExecuteInTx(ctx, sql.LevelDefault, func(ctx context.Context) error {
-			var isNonceUsed bool
 			err = p.data.MarkTwitterNonceAsUsed(ctx, tweet.ID, *registrationNonce)
-			switch err {
-			case nil:
-			case twitter.ErrDuplicateNonce:
-				isNonceUsed = true
-			default:
+			if err != nil {
 				return err
 			}
 
-			// Only save updated tip addresses when the nonce isn't used
-			if !isNonceUsed {
-				err = p.updateCachedTwitterUser(ctx, tweet.AdditionalMetadata.Author, tipAccount)
-				switch err {
-				case nil:
-					isRegistered = true
-				case twitter.ErrDuplicateTipAddress:
-				default:
-					return err
-				}
+			err = p.updateCachedTwitterUser(ctx, tweet.AdditionalMetadata.Author, tipAccount)
+			if err != nil {
+				return err
 			}
 
-			return p.data.MarkTweetAsProcessed(ctx, tweet.ID)
+			err = p.data.MarkTweetAsProcessed(ctx, tweet.ID)
+			if err != nil {
+				return err
+			}
+
+			return nil
 		})
-		if err != nil {
-			return errors.Wrap(err, "error saving registration details")
-		}
 
-		if isRegistered {
+		switch err {
+		case nil:
 			go push_util.SendTwitterAccountConnectedPushNotification(ctx, p.data, p.pusher, tipAccount)
+		case twitter.ErrDuplicateTipAddress, twitter.ErrDuplicateNonce:
+			// Any race conditions with duplicate nonces or tip addresses will are ignored
+			//
+			// todo: In the future, support multiple tip address mappings
+		default:
+			return errors.Wrap(err, "error saving new registration")
 		}
 	}