fix FTBFS

1 files changed, 14 insertions, 17 deletions

diff --git a/src/testing/testing_api_cmd_tip_authorize.c b/src/testing/testing_api_cmd_tip_authorize.c
index 3fb4c1bc..4be6b30a 100644
--- a/src/testing/testing_api_cmd_tip_authorize.c
+++ b/src/testing/testing_api_cmd_tip_authorize.c
@@ -198,28 +198,26 @@ tip_authorize_cb (void *cls,
  * @param index index number of the object to extract.
  * @return #GNUNET_OK on success
  */
-static int
+static enum GNUNET_GenericReturnValue
 tip_authorize_traits (void *cls,
                       const void **ret,
                       const char *trait,
                       unsigned int index)
 {
   struct TipAuthorizeState *tas = cls;
-
-  {
-    struct TALER_TESTING_Trait traits[] = {
-      TALER_TESTING_make_trait_tip_id (0, &tas->tip_id),
-      TALER_TESTING_make_trait_amount_obj (0, &tas->amount),
-      TALER_TESTING_make_trait_string (0, tas->justification),
-      TALER_TESTING_make_trait_absolute_time (0, &tas->tip_expiration),
-      TALER_TESTING_trait_end (),
-    };
-
-    return TALER_TESTING_get_trait (traits,
-                                    ret,
-                                    trait,
-                                    index);
-  }
+  struct TALER_TESTING_Trait traits[] = {
+    TALER_TESTING_make_trait_tip_id (&tas->tip_id),
+    TALER_TESTING_make_trait_amount (&tas->amount),
+    TALER_TESTING_make_trait_reason (&tas->justification),
+    TALER_TESTING_make_trait_absolute_time (0,
+                                            &tas->tip_expiration),
+    TALER_TESTING_trait_end (),
+  };
+
+  return TALER_TESTING_get_trait (traits,
+                                  ret,
+                                  trait,
+                                  index);
 }
 
 
@@ -270,7 +268,6 @@ do_retry (void *cls)
       tas->reserve_reference);
     GNUNET_assert (GNUNET_OK ==
                    TALER_TESTING_get_trait_reserve_pub (reserve_cmd,
-                                                        0,
                                                         &reserve_pub));
     tas->tao = TALER_MERCHANT_tip_authorize2 (tas->is->ctx,
                                               tas->merchant_url,