refactor and rename arguments

Author: asloobq

tests/test_bidstream_client.py

@@ -247,7 +247,7 @@ def test_token_expiry_custom_decryption_time(self):  #TokenExpiryAndCustomNow
         expires_at = now - dt.timedelta(days=60)
         created_at = expires_at - dt.timedelta(minutes=1)
         token = generate_uid_token(IdentityScope.UID2, AdvertisingTokenVersion.ADVERTISING_TOKEN_V4,
-                                   identity_established_at=created_at, expires_at=expires_at)
+                                   generated_at=created_at, expires_at=expires_at)
         result = self._client._decrypt_token_into_raw_uid(token, None, expires_at + dt.timedelta(seconds=1))
         self.assertFalse(result.success)
         self.assertEqual(result.status, DecryptionStatus.EXPIRED_TOKEN)

uid2_client/uid2_token_generator.py

@@ -99,15 +99,15 @@ def generate_uid2_token_v4(id_str, master_key, site_id, site_key, params=default
 
     @staticmethod
     def generate_uid_token(id_str, master_key, site_id, site_key, identity_scope, token_version,
-                           identity_established_at=None, generated_at=None, expires_at=None):
+                           identity_established=None, token_generated=None, token_expiry=None):
         params = default_params()
         params.identity_scope = identity_scope
-        if identity_established_at is not None:
-            params.identity_established = identity_established_at
-        if generated_at is not None:
-            params.token_generated = generated_at
-        if expires_at is not None:
-            params.token_expiry = expires_at
+        if identity_established is not None:
+            params.identity_established = identity_established
+        if token_generated is not None:
+            params.token_generated = token_generated
+        if token_expiry is not None:
+            params.token_expiry = token_expiry
         if token_version == AdvertisingTokenVersion.ADVERTISING_TOKEN_V2:
             return UID2TokenGenerator.generate_uid2_token_v2(id_str, master_key, site_id, site_key, params)
         elif token_version == AdvertisingTokenVersion.ADVERTISING_TOKEN_V3: