-rename fest for #7045

6 files changed, 21 insertions, 28 deletions

diff --git a/src/testing/test_anastasis_api.conf b/src/testing/test_anastasis_api.conf
index 52be592..3dfc6ba 100644
--- a/src/testing/test_anastasis_api.conf
+++ b/src/testing/test_anastasis_api.conf
@@ -54,7 +54,7 @@ ANNUAL_POLICY_UPLOAD_LIMIT = 64
 
 INSURANCE = EUR:0
 
-SERVER_SALT = salty
+PROVIDER_SALT = salty
 
 
 # Annual fee we charge.
diff --git a/src/testing/testing_api_cmd_config.c b/src/testing/testing_api_cmd_config.c
index b4cf6e0..92a8ae1 100644
--- a/src/testing/testing_api_cmd_config.c
+++ b/src/testing/testing_api_cmd_config.c
@@ -53,7 +53,7 @@ struct ConfigState
   /**
    * The salt value from server.
    */
-  struct ANASTASIS_CRYPTO_ProviderSaltP salt;
+  struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt;
 };
 
 
@@ -93,7 +93,7 @@ config_cb (void *cls,
     TALER_TESTING_interpreter_fail (ss->is);
     return;
   }
-  ss->salt = config->salt;
+  ss->provider_salt = config->provider_salt;
   TALER_TESTING_interpreter_next (ss->is);
 }
 
@@ -168,7 +168,7 @@ config_traits (void *cls,
 {
   struct ConfigState *ss = cls;
   struct TALER_TESTING_Trait traits[] = {
-    ANASTASIS_TESTING_make_trait_salt (&ss->salt),
+    ANASTASIS_TESTING_make_trait_provider_salt (&ss->provider_salt),
     TALER_TESTING_trait_end ()
   };
 
diff --git a/src/testing/testing_api_cmd_policy_store.c b/src/testing/testing_api_cmd_policy_store.c
index 08e567c..f23489d 100644
--- a/src/testing/testing_api_cmd_policy_store.c
+++ b/src/testing/testing_api_cmd_policy_store.c
@@ -281,7 +281,7 @@ policy_store_run (void *cls,
     &pss->anastasis_priv,
     pss->recovery_data,
     pss->recovery_data_size,
-    NULL, 0, /* meta-data */
+    "metadata", strlen ("metadata"),
     (0 != (ANASTASIS_TESTING_PSO_REQUEST_PAYMENT & pss->psopt)),
     pss->payment_secret_set ? &pss->payment_secret_request : NULL,
     GNUNET_TIME_UNIT_ZERO,
diff --git a/src/testing/testing_cmd_recover_secret.c b/src/testing/testing_cmd_recover_secret.c
index 153143d..3b12012 100644
--- a/src/testing/testing_cmd_recover_secret.c
+++ b/src/testing/testing_cmd_recover_secret.c
@@ -67,11 +67,6 @@ struct RecoverSecretState
   json_t *id_data;
 
   /**
-   * Salt to be used to derive the id
-   */
-  struct ANASTASIS_CRYPTO_ProviderSaltP *salt;
-
-  /**
    * Recovery information from the lookup
    */
   struct ANASTASIS_RecoveryInformation *ri;
@@ -188,7 +183,7 @@ recover_secret_run (void *cls,
 {
   struct RecoverSecretState *rss = cls;
   const struct TALER_TESTING_Command *ref;
-  const struct ANASTASIS_CRYPTO_ProviderSaltP *salt;
+  const struct ANASTASIS_CRYPTO_ProviderSaltP *provider_salt;
   rss->is = is;
 
   if (NULL != rss->download_reference)
@@ -203,8 +198,8 @@ recover_secret_run (void *cls,
       return;
     }
     if (GNUNET_OK !=
-        ANASTASIS_TESTING_get_trait_salt (ref,
-                                          &salt))
+        ANASTASIS_TESTING_get_trait_provider_salt (ref,
+                                                   &provider_salt))
     {
       GNUNET_break (0);
       TALER_TESTING_interpreter_fail (rss->is);
@@ -236,7 +231,7 @@ recover_secret_run (void *cls,
                                             rss->id_data,
                                             rss->version,
                                             rss->anastasis_url,
-                                            salt,
+                                            provider_salt,
                                             &policy_lookup_cb,
                                             rss,
                                             &core_secret_cb,
diff --git a/src/testing/testing_cmd_secret_share.c b/src/testing/testing_cmd_secret_share.c
index 7a9dbc0..26a237d 100644
--- a/src/testing/testing_cmd_secret_share.c
+++ b/src/testing/testing_cmd_secret_share.c
@@ -275,7 +275,7 @@ secret_share_run (void *cls,
   pds.provider_url = sss->anastasis_url;
   {
     const struct TALER_TESTING_Command *ref;
-    const struct ANASTASIS_CRYPTO_ProviderSaltP *salt;
+    const struct ANASTASIS_CRYPTO_ProviderSaltP *provider_salt;
 
     ref = TALER_TESTING_interpreter_lookup_command (is,
                                                     sss->config_ref);
@@ -286,14 +286,14 @@ secret_share_run (void *cls,
       return;
     }
     if (GNUNET_OK !=
-        ANASTASIS_TESTING_get_trait_salt (ref,
-                                          &salt))
+        ANASTASIS_TESTING_get_trait_provider_salt (ref,
+                                                   &provider_salt))
     {
       GNUNET_break (0);
       TALER_TESTING_interpreter_fail (sss->is);
       return;
     }
-    pds.provider_salt = *salt;
+    pds.provider_salt = *provider_salt;
   }
 
   sss->sso = ANASTASIS_secret_share (is->ctx,
diff --git a/src/testing/testing_cmd_truth_upload.c b/src/testing/testing_cmd_truth_upload.c
index 99c2879..89ba790 100644
--- a/src/testing/testing_cmd_truth_upload.c
+++ b/src/testing/testing_cmd_truth_upload.c
@@ -181,15 +181,15 @@ truth_upload_run (void *cls,
 {
   struct TruthUploadState *tus = cls;
   const struct TALER_TESTING_Command *ref;
-  const struct ANASTASIS_CRYPTO_ProviderSaltP *salt;
+  const struct ANASTASIS_CRYPTO_ProviderSaltP *provider_salt;
   struct ANASTASIS_CRYPTO_UserIdentifierP user_id;
 
   tus->is = is;
   if (NULL != tus->salt_reference)
   {
-    ref = TALER_TESTING_interpreter_lookup_command
-            (is,
-            tus->salt_reference);
+    ref = TALER_TESTING_interpreter_lookup_command (
+      is,
+      tus->salt_reference);
     if (NULL == ref)
     {
       GNUNET_break (0);
@@ -197,26 +197,24 @@ truth_upload_run (void *cls,
       return;
     }
     if (GNUNET_OK !=
-        ANASTASIS_TESTING_get_trait_salt (ref,
-                                          &salt))
+        ANASTASIS_TESTING_get_trait_provider_salt (ref,
+                                                   &provider_salt))
     {
       GNUNET_break (0);
       TALER_TESTING_interpreter_fail (tus->is);
       return;
     }
   }
-
   ANASTASIS_CRYPTO_user_identifier_derive (tus->id_data,
-                                           salt,
+                                           provider_salt,
                                            &user_id);
-
   tus->tuo = ANASTASIS_truth_upload (is->ctx,
                                      &user_id,
                                      tus->anastasis_url,
                                      tus->method,
                                      tus->instructions,
                                      tus->mime_type,
-                                     salt,
+                                     provider_salt,
                                      tus->truth_data,
                                      tus->truth_data_size,
                                      false, /* force payment */