get tests to work for #6363

3 files changed, 3 insertions, 55 deletions

diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c
index 391164c2..74cb5cdb 100644
--- a/src/testing/test_merchant_api.c
+++ b/src/testing/test_merchant_api.c
@@ -459,7 +459,7 @@ run (void *cls,
                                         false,
                                         false,
                                         MHD_HTTP_OK),
-    TALER_TESTING_cmd_merchant_get_order ("get-order-merchant-1-2",
+    TALER_TESTING_cmd_merchant_get_order ("get-order-merchant-1-2a",
                                           merchant_url,
                                           "create-proposal-1",
                                           TALER_MERCHANT_OSC_PAID,
@@ -497,7 +497,6 @@ run (void *cls,
                                               NULL),
     TALER_TESTING_cmd_run_tme ("run taler-merchant-exchange-1",
                                config_file),
-#if 0
     TALER_TESTING_cmd_merchant_post_transfer2 ("post-transfer-bad",
                                                merchant_url,
                                                PAYTO_I1,
@@ -519,13 +518,12 @@ run (void *cls,
                                                 merchant_url,
                                                 "post-transfer-bad",
                                                 MHD_HTTP_NO_CONTENT),
-#endif
-    TALER_TESTING_cmd_merchant_get_order2 ("get-order-merchant-1-2",
+    TALER_TESTING_cmd_merchant_get_order2 ("get-order-merchant-1-2b",
                                            merchant_url,
                                            "create-proposal-1",
                                            TALER_MERCHANT_OSC_PAID,
                                            true,
-                                           order_1_transfers,
+                                           order_1_transfers, /* "post-transfer-1" */
                                            false,
                                            NULL,
                                            NULL,
diff --git a/src/testing/testing_api_cmd_merchant_get_order.c b/src/testing/testing_api_cmd_merchant_get_order.c
index ce472a61..917a4a23 100644
--- a/src/testing/testing_api_cmd_merchant_get_order.c
+++ b/src/testing/testing_api_cmd_merchant_get_order.c
@@ -311,50 +311,6 @@ merchant_get_order_cb (
               return;
             }
           }
-          {
-            struct TALER_Amount transfer_total;
-            const struct TALER_Amount *transfer_amount;
-            const struct TALER_Amount *transfer_fee;
-
-            if ((GNUNET_OK !=
-                 TALER_TESTING_get_trait_amount (transfer_cmd,
-                                                 &transfer_amount)) ||
-                (GNUNET_OK !=
-                 TALER_TESTING_get_trait_fee (transfer_cmd,
-                                              &transfer_fee)))
-            {
-              GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                          "Could not fetch wire transfer amount/fee\n");
-              TALER_TESTING_interpreter_fail (gos->is);
-              return;
-            }
-            if (0 > TALER_amount_add (&transfer_total,
-                                      transfer_amount,
-                                      transfer_fee))
-            {
-              GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                          "Could not compute total wire transfer amount: %s\n",
-                          TALER_amount2s (transfer_amount));
-              GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                          "Could not compute total wire transfer amount: %s\n",
-                          TALER_amount2s (transfer_fee));
-              TALER_TESTING_interpreter_fail (gos->is);
-              return;
-            }
-            if ((GNUNET_OK !=
-                 TALER_amount_cmp_currency (
-                   &transfer_total,
-                   &osr->details.success.details.paid.wts[i].total_amount)) ||
-                (0 != TALER_amount_cmp (
-                   &transfer_total,
-                   &osr->details.success.details.paid.wts[i].total_amount)))
-            {
-              GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                          "Wire transfer total does not match\n");
-              TALER_TESTING_interpreter_fail (gos->is);
-              return;
-            }
-          }
         }
         if (gos->refunded != osr->details.success.details.paid.refunded)
         {
diff --git a/src/testing/testing_api_cmd_post_transfers.c b/src/testing/testing_api_cmd_post_transfers.c
index 4971d952..a0b823d0 100644
--- a/src/testing/testing_api_cmd_post_transfers.c
+++ b/src/testing/testing_api_cmd_post_transfers.c
@@ -90,11 +90,6 @@ struct PostTransfersState
   struct TALER_Amount credit_amount;
 
   /**
-   * The fee incurred on the wire transfer.
-   */
-  struct TALER_Amount wire_fee;
-
-  /**
    * Expected HTTP response code.
    */
   unsigned int http_status;
@@ -184,7 +179,6 @@ post_transfers_traits (void *cls,
       (const char **) &pts->credit_account),
     TALER_TESTING_make_trait_h_payto (&pts->h_payto),
     TALER_TESTING_make_trait_amount (&pts->credit_amount),
-    TALER_TESTING_make_trait_fee (&pts->wire_fee),
     TALER_TESTING_make_trait_exchange_url (
       (const char **) &pts->exchange_url),
     TALER_TESTING_make_trait_bank_row (&pts->serial),