[taler-anastasis] branch master updated: fix minor test case issues

[gnunet]

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

grothoff pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new f0c8fe8  fix minor test case issues
f0c8fe8 is described below

commit f0c8fe8358bb550320b40a15c036fa5754ea2791
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Feb 13 15:54:03 2021 +0100

    fix minor test case issues
---
 src/testing/test_anastasis_api.c           |  2 +-
 src/testing/test_anastasis_api.conf        |  3 ++-
 src/testing/testing_api_cmd_policy_store.c | 30 ++++++++++++++++++++++++++++--
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/testing/test_anastasis_api.c b/src/testing/test_anastasis_api.c
index 9fff2ba..f470c47 100644
--- a/src/testing/test_anastasis_api.c
+++ b/src/testing/test_anastasis_api.c
@@ -206,7 +206,7 @@ run (void *cls,
       strlen ("The-Answer"),
       "The-Answer",
       ANASTASIS_TESTING_TSO_NONE,
-      MHD_HTTP_OK),
+      MHD_HTTP_NO_CONTENT),
     ANASTASIS_TESTING_cmd_keyshare_lookup (
       "keyshare-lookup-1",
       anastasis_url,
diff --git a/src/testing/test_anastasis_api.conf 
b/src/testing/test_anastasis_api.conf
index 6d56511..007ffd1 100644
--- a/src/testing/test_anastasis_api.conf
+++ b/src/testing/test_anastasis_api.conf
@@ -60,7 +60,8 @@ PAYMENT_BACKEND_URL = http://localhost:8080/
 # Annual fee we charge.
 #ANNUAL_FEE = EUR:4.99
 ANNUAL_FEE = EUR:4.99
-#ANNUAL_FEE = EUR:0
+
+TRUTH_UPLOAD_FEE = EUR:0
 
 # Authentication costs
 [authorization-question]
diff --git a/src/testing/testing_api_cmd_policy_store.c 
b/src/testing/testing_api_cmd_policy_store.c
index 069b095..79704b8 100644
--- a/src/testing/testing_api_cmd_policy_store.c
+++ b/src/testing/testing_api_cmd_policy_store.c
@@ -40,7 +40,7 @@ struct PolicyStoreState
   /**
    * Claim token we got back, if any. Otherwise all zeros.
    */
-  struct TALER_ClaimTokenP token;
+  struct TALER_ClaimTokenP claim_token;
 
   /**
    * The policy data.
@@ -103,6 +103,11 @@ struct PolicyStoreState
    */
   struct ANASTASIS_PaymentSecretP payment_secret_request;
 
+  /**
+   * The order ID, for making the payment.
+   */
+  char *order_id;
+
   /**
    * Payment order ID we are to provide in the response, or zero.
    */
@@ -157,6 +162,22 @@ policy_store_cb (void *cls,
     break;
   case ANASTASIS_US_PAYMENT_REQUIRED:
     pss->payment_secret_response = ud->details.payment.ps;
+    {
+      struct TALER_MERCHANT_PayUriData pd;
+
+      if (GNUNET_OK !=
+          TALER_MERCHANT_parse_pay_uri (ud->details.payment.payment_request,
+                                        &pd))
+      {
+        GNUNET_break (0);
+        TALER_TESTING_interpreter_fail (pss->is);
+        return;
+      }
+      pss->order_id = GNUNET_strdup (pd.order_id);
+      if (NULL != pd.claim_token)
+        pss->claim_token = *pd.claim_token;
+      TALER_MERCHANT_parse_pay_uri_free (&pd);
+    }
     break;
   case ANASTASIS_US_HTTP_ERROR:
     break;
@@ -298,6 +319,7 @@ policy_store_cleanup (void *cls,
     ANASTASIS_policy_store_cancel (pss->pso);
     pss->pso = NULL;
   }
+  GNUNET_free (pss->order_id);
   GNUNET_free (pss);
 }
 
@@ -320,7 +342,11 @@ policy_store_traits (void *cls,
   struct PolicyStoreState *pss = cls;
   struct TALER_TESTING_Trait traits[] = {
     TALER_TESTING_make_trait_claim_token (0,
-                                          &pss->token),
+                                          &pss->claim_token),
+    TALER_TESTING_make_trait_order_id (0,
+                                       pss->order_id),
+    ANASTASIS_TESTING_make_trait_hash (0,
+                                       &pss->curr_hash),
     ANASTASIS_TESTING_make_trait_account_pub (0,
                                               &pss->anastasis_pub),
     ANASTASIS_TESTING_make_trait_account_priv (0,

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