[taler-merchant] branch master updated (64e64141 -> a7b07726)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ttn pushed a change to branch master
in repository merchant.

    from 64e64141 introduce new data type for the post-orders hash used for 
idempotency checks, as well as the hash and salt for authentication checks
     new 2f24b760 followup to 2021-12-19, "-introduce new types for tip 
identifiers and tip pickups"
     new a7b07726 followup to 2021-12-19, "introduce new data type for the 
post-orders hash used for idempotency checks, as well as the hash and salt for 
authentication checks"

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/backenddb/test_merchantdb.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c
index d6d490b6..990c6b83 100644
--- a/src/backenddb/test_merchantdb.c
+++ b/src/backenddb/test_merchantdb.c
@@ -1346,7 +1346,7 @@ test_insert_order (const struct InstanceData *instance,
                    const struct OrderData *order,
                    enum GNUNET_DB_QueryStatus expected_result)
 {
-  struct GNUNET_HashCode h_post;
+  struct TALER_MerchantPostDataHashP h_post;
 
   memset (&h_post,
           42,
@@ -1377,8 +1377,8 @@ test_lookup_order (const struct InstanceData *instance,
 {
   struct TALER_ClaimTokenP ct;
   json_t *lookup_terms = NULL;
-  struct GNUNET_HashCode oh;
-  struct GNUNET_HashCode wh;
+  struct TALER_MerchantPostDataHashP oh;
+  struct TALER_MerchantPostDataHashP wh;
 
   memset (&wh,
           42,
@@ -2015,7 +2015,7 @@ run_test_orders (struct TestOrders_Closure *cls)
                                        &cls->orders[0]));
   /* Make sure it fails correctly for nonexistent orders */
   {
-    struct GNUNET_HashCode unused;
+    struct TALER_MerchantPostDataHashP unused;
 
     if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
         plugin->lookup_order (plugin->cls,
@@ -5080,7 +5080,7 @@ static int
 test_lookup_pickup (
   const struct InstanceData *instance,
   const struct TipData *tip,
-  const struct GNUNET_HashCode *pickup_id,
+  const struct TALER_PickupIdentifierP *pickup_id,
   const char *expected_exchange_url,
   const struct TALER_ReservePrivateKeyP *expected_reserve_priv,
   unsigned int expected_sigs_length,
@@ -5191,7 +5191,7 @@ struct TestLookupTips_Closure
 static void
 lookup_tips_cb (void *cls,
                 uint64_t row_id,
-                struct GNUNET_HashCode tip_id,
+                struct TALER_TipIdentifierP tip_id,
                 struct TALER_Amount amount)
 {
   struct TestLookupTips_Closure *cmp = cls;
@@ -5331,7 +5331,7 @@ struct TestTips_Closure
   /**
    * Id of a pickup.
    */
-  struct GNUNET_HashCode pickup_id;
+  struct TALER_PickupIdentifierP pickup_id;
 
   /**
    * Private key of the pickup.
@@ -5404,7 +5404,7 @@ pre_test_tips (struct TestTips_Closure *cls)
   cls->pickup_sig.cipher = TALER_DENOMINATION_RSA;
   cls->pickup_sig.details.blinded_rsa_signature
     = GNUNET_CRYPTO_rsa_sign_fdh (cls->pickup_priv,
-                                  &cls->pickup_id);
+                                  &cls->pickup_id.hash);
 }
 
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.