1 files changed, 28 insertions, 41 deletions

diff --git a/src/testing/testing_cmd_secret_share.c b/src/testing/testing_cmd_secret_share.c
index d9122e8..3c401d2 100644
--- a/src/testing/testing_cmd_secret_share.c
+++ b/src/testing/testing_cmd_secret_share.c
@@ -3,14 +3,14 @@
   Copyright (C) 2020 Anastasis SARL
 
   Anastasis is free software; you can redistribute it and/or modify it under the
-  terms of the GNU Lesser General Public License as published by the Free Software
+  terms of the GNU General Public License as published by the Free Software
   Foundation; either version 3, or (at your option) any later version.
 
   Anastasis is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-  A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details.
+  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
-  You should have received a copy of the GNU Affero General Public License along with
+  You should have received a copy of the GNU General Public License along with
   Anastasis; see the file COPYING.GPL.  If not, see <http://www.gnu.org/licenses/>
 */
 /**
@@ -135,14 +135,7 @@ secret_share_result_cb (void *cls,
   sss->sso = NULL;
   if (sr->ss != sss->want_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                sr->ss,
-                sss->is->commands[sss->is->ip].label,
-                __FILE__,
-                __LINE__);
     TALER_TESTING_interpreter_fail (sss->is);
-    return;
   }
   switch (sr->ss)
   {
@@ -199,7 +192,7 @@ secret_share_run (void *cls,
     for (unsigned int i = 0; i < sss->cmd_label_array_length; i++)
     {
       const struct TALER_TESTING_Command *ref;
-      const struct ANASTASIS_Policy *policy;
+      const struct ANASTASIS_Policy **policy;
 
       ref = TALER_TESTING_interpreter_lookup_command (is,
                                                       sss->cmd_label_array[i]);
@@ -211,15 +204,14 @@ secret_share_run (void *cls,
       }
       if (GNUNET_OK !=
           ANASTASIS_TESTING_get_trait_policy (ref,
-                                              0,
                                               &policy))
       {
         GNUNET_break (0);
         TALER_TESTING_interpreter_fail (sss->is);
         return;
       }
-      GNUNET_assert (NULL != policy);
-      policies[i] = policy;
+      GNUNET_assert (NULL != *policy);
+      policies[i] = *policy;
     }
   }
 
@@ -238,15 +230,13 @@ secret_share_run (void *cls,
     }
     if (GNUNET_OK !=
         TALER_TESTING_get_trait_order_id (ref,
-                                          0,
                                           &order_id))
     {
       GNUNET_break (0);
       TALER_TESTING_interpreter_fail (sss->is);
       return;
     }
-    sss->payment_order_id = (char *) order_id;
-
+    sss->payment_order_id = GNUNET_strdup (order_id);
     if (NULL == sss->payment_order_id)
     {
       GNUNET_break (0);
@@ -277,7 +267,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);
@@ -288,30 +278,30 @@ secret_share_run (void *cls,
       return;
     }
     if (GNUNET_OK !=
-        ANASTASIS_TESTING_get_trait_salt (ref,
-                                          0,
-                                          &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,
-                                     sss->id_data,
-                                     &pds,
-                                     1,
-                                     policies,
-                                     sss->cmd_label_array_length,
-                                     false,
-                                     GNUNET_TIME_UNIT_ZERO,
-                                     &secret_share_result_cb,
-                                     sss,
-                                     "test-case",
-                                     sss->core_secret,
-                                     sss->core_secret_size);
+  sss->sso = ANASTASIS_secret_share (
+    TALER_TESTING_interpreter_get_context (is),
+    sss->id_data,
+    &pds,
+    1,
+    policies,
+    sss->cmd_label_array_length,
+    false,
+    GNUNET_TIME_UNIT_ZERO,
+    &secret_share_result_cb,
+    sss,
+    "test-case",
+    sss->core_secret,
+    sss->core_secret_size);
   if (NULL == sss->sso)
   {
     GNUNET_break (0);
@@ -368,12 +358,9 @@ secret_share_traits (void *cls,
 {
   struct SecretShareState *sss = cls;
   struct TALER_TESTING_Trait traits[] = {
-    TALER_TESTING_make_trait_claim_token (0,
-                                          &sss->token),
-    ANASTASIS_TESTING_make_trait_core_secret (0,
-                                              sss->core_secret),
-    TALER_TESTING_make_trait_order_id (0,
-                                       sss->payment_order_id),
+    TALER_TESTING_make_trait_claim_token (&sss->token),
+    ANASTASIS_TESTING_make_trait_core_secret (sss->core_secret),
+    TALER_TESTING_make_trait_order_id (sss->payment_order_id),
     TALER_TESTING_trait_end ()
   };