sync

commit 7a7ba1472ca0f9ef9b0dd917081faa13d9e1b0e4
parent 7015a99a3a755f521267a0a9f3a90412bfc0141d
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 30 Jul 2024 23:35:01 +0200

deconflict trait name with new exchange account trait

Diffstat:
M
src/include/sync_testing_lib.h
 | 
8
++++----
M
src/testing/testing_api_cmd_backup_download.c
 | 
4
++--
M
src/testing/testing_api_cmd_backup_upload.c
 | 
16
++++++++--------

3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/include/sync_testing_lib.h b/src/include/sync_testing_lib.h
@@ -122,10 +122,10 @@ SYNC_TESTING_cmd_backup_upload (const char *label,
  * @param op macro to call
  */
 #define SYNC_TESTING_SIMPLE_TRAITS(op) \
-  op (account_pub, const struct SYNC_AccountPublicKeyP)   \
-  op (account_priv, const struct SYNC_AccountPrivateKeyP) \
-  op (prev_hash, const struct GNUNET_HashCode) \
-  op (curr_hash, const struct GNUNET_HashCode)
+        op (sync_account_pub, const struct SYNC_AccountPublicKeyP)   \
+        op (sync_account_priv, const struct SYNC_AccountPrivateKeyP) \
+        op (prev_hash, const struct GNUNET_HashCode) \
+        op (curr_hash, const struct GNUNET_HashCode)
 
 
 /* FIXME: eventually switch to libgnunettesting with the SYNC_ prefix for
diff --git a/src/testing/testing_api_cmd_backup_download.c b/src/testing/testing_api_cmd_backup_download.c
@@ -165,8 +165,8 @@ backup_download_run (void *cls,
       return;
     }
     if (GNUNET_OK !=
-        TALER_TESTING_get_trait_account_pub (upload_cmd,
-                                             &sync_pub))
+        TALER_TESTING_get_trait_sync_account_pub (upload_cmd,
+                                                  &sync_pub))
     {
       GNUNET_break (0);
       TALER_TESTING_interpreter_fail (bds->is);
diff --git a/src/testing/testing_api_cmd_backup_upload.c b/src/testing/testing_api_cmd_backup_upload.c
@@ -257,8 +257,8 @@ backup_upload_run (void *cls,
       const struct SYNC_AccountPrivateKeyP *priv;
 
       if (GNUNET_OK !=
-          TALER_TESTING_get_trait_account_priv (ref,
-                                                &priv))
+          TALER_TESTING_get_trait_sync_account_priv (ref,
+                                                     &priv))
       {
         GNUNET_break (0);
         TALER_TESTING_interpreter_fail (bus->is);
@@ -270,8 +270,8 @@ backup_upload_run (void *cls,
       const struct SYNC_AccountPublicKeyP *pub;
 
       if (GNUNET_OK !=
-          TALER_TESTING_get_trait_account_pub (ref,
-                                               &pub))
+          TALER_TESTING_get_trait_sync_account_pub (ref,
+                                                    &pub))
       {
         GNUNET_break (0);
         TALER_TESTING_interpreter_fail (bus->is);
@@ -385,15 +385,15 @@ backup_upload_traits (void *cls,
     TALER_TESTING_make_trait_curr_hash (&bus->curr_hash),
     TALER_TESTING_make_trait_prev_hash (&bus->prev_hash),
     TALER_TESTING_make_trait_claim_token (&bus->token),
-    TALER_TESTING_make_trait_account_pub (&bus->sync_pub),
-    TALER_TESTING_make_trait_account_priv (&bus->sync_priv),
+    TALER_TESTING_make_trait_sync_account_pub (&bus->sync_pub),
+    TALER_TESTING_make_trait_sync_account_priv (&bus->sync_priv),
     TALER_TESTING_make_trait_order_id (bus->payment_order_id),
     TALER_TESTING_trait_end ()
   };
   struct TALER_TESTING_Trait ftraits[] = {
     TALER_TESTING_make_trait_claim_token (&bus->token),
-    TALER_TESTING_make_trait_account_pub (&bus->sync_pub),
-    TALER_TESTING_make_trait_account_priv (&bus->sync_priv),
+    TALER_TESTING_make_trait_sync_account_pub (&bus->sync_pub),
+    TALER_TESTING_make_trait_sync_account_priv (&bus->sync_priv),
     TALER_TESTING_make_trait_order_id (bus->payment_order_id),
     TALER_TESTING_trait_end ()
   };