fix #5434 (no more salt in exchange wire replies)

6 files changed, 17 insertions, 18 deletions

diff --git a/src/exchange-lib/exchange_api_deposit.c b/src/exchange-lib/exchange_api_deposit.c
index 53fd3c6e6..27711770a 100644
--- a/src/exchange-lib/exchange_api_deposit.c
+++ b/src/exchange-lib/exchange_api_deposit.c
@@ -416,8 +416,8 @@ TALER_EXCHANGE_deposit (struct TALER_EXCHANGE_Handle *exchange,
 		 MAH_handle_is_ready (exchange));
   /* initialize h_wire */
   if (GNUNET_OK !=
-      TALER_JSON_wire_signature_hash (wire_details,
-                                      &h_wire))
+      TALER_JSON_merchant_wire_signature_hash (wire_details,
+                                               &h_wire))
   {
     GNUNET_break (0);
     return NULL;
diff --git a/src/exchange-lib/exchange_api_wire.c b/src/exchange-lib/exchange_api_wire.c
index af7bbf3b8..f9ef10cda 100644
--- a/src/exchange-lib/exchange_api_wire.c
+++ b/src/exchange-lib/exchange_api_wire.c
@@ -272,7 +272,6 @@ handle_wire_finished (void *cls,
           json_t *account;
           struct GNUNET_JSON_Specification spec_account[] = {
             GNUNET_JSON_spec_string ("url", &wa->url),
-            GNUNET_JSON_spec_string ("salt", &wa->salt),
             GNUNET_JSON_spec_fixed_auto ("master_sig", &wa->master_sig),
             GNUNET_JSON_spec_end()
           };
@@ -281,8 +280,8 @@ handle_wire_finished (void *cls,
           account = json_array_get (accounts,
                                     i);
           if (GNUNET_OK !=
-              TALER_JSON_wire_signature_check (account,
-                                               &key_state->master_pub))
+              TALER_JSON_exchange_wire_signature_check (account,
+                                                        &key_state->master_pub))
           {
             /* bogus reply */
             GNUNET_break_op (0);
diff --git a/src/exchange-lib/test_exchange_api_home/.config/taler/account-2.json b/src/exchange-lib/test_exchange_api_home/.config/taler/account-2.json
index 85d80de56..159e03171 100644
--- a/src/exchange-lib/test_exchange_api_home/.config/taler/account-2.json
+++ b/src/exchange-lib/test_exchange_api_home/.config/taler/account-2.json
@@ -1,5 +1,4 @@
 {
   "url": "payto://x-taler-bank/localhost:8082/2",
-  "salt": "TMXB995ZZVKA02AG4074X3C6XX0BFTHY8XK76EF4BSG5XVDF069FEBN4TCKW9GS7NKZH409GKAVHMQPA3T361MC6VM7J268V3GBH42R",
-  "master_sig": "CK7BGHKYVAT7DMVCN00DQ0761NCTJVESZT69049BCF3SKNJKVHXXEQ5X6FH2HFGHCJ18YA1MGHBD8RRG4W3G4KJWQJDY2CGPGTHDJ2G"
+  "master_sig": "HC47BZN3C0KJ2VPMJ5EJWD2FXJ72AET0NWFE6JGSGK5CXS4GSKJJ6Z7BTS56JWM7B40SD61Z5GYYMRRE3X9JTJBVMWE0X7XHNXQ9P38"
 }
\ No newline at end of file
diff --git a/src/exchange-lib/test_exchange_api_home/.config/taler/x-taler-bank.json b/src/exchange-lib/test_exchange_api_home/.config/taler/x-taler-bank.json
index 9445f048e..a15df27ca 100644
--- a/src/exchange-lib/test_exchange_api_home/.config/taler/x-taler-bank.json
+++ b/src/exchange-lib/test_exchange_api_home/.config/taler/x-taler-bank.json
@@ -1,5 +1,4 @@
 {
   "url": "payto://x-taler-bank/http://localhost:8082/2",
-  "salt": "WGRD0W7YKD8ZAN960B0JBRARRY0K5FQ4920Q3DJBTYH4GY7W0XNAX1F04R5B1E0RWH1NFG08TM8K1517WNCXTJM9KMH4913Q5XPK0N8",
-  "master_sig": "J4N0KP64MGNEQX9HST9TDWK67152MSHHM9CTZH8GSMKD607BXSAF209AQYDKYT6QJP0NQXYXC1JMM9Z405DJHGV75JFMWP4G6WB6A00"
+  "master_sig": "KQ0BWSCNVR7HGGSAMCYK8ZM30RBS1MHMXT3QBN01PZWC9TV72FEE5RJ7T84C8134EPV6WEBXXY2MTFNE8ZXST6JEJQKR8HX6FQPVY10"
 }
\ No newline at end of file
diff --git a/src/exchange-lib/testing_api_cmd_deposit.c b/src/exchange-lib/testing_api_cmd_deposit.c
index ecace5654..604fa949b 100644
--- a/src/exchange-lib/testing_api_cmd_deposit.c
+++ b/src/exchange-lib/testing_api_cmd_deposit.c
@@ -330,8 +330,8 @@ deposit_run (void *cls,
     dr.h_contract_terms = h_contract_terms;
     GNUNET_assert
       (GNUNET_OK ==
-       TALER_JSON_wire_signature_hash (ds->wire_details,
-                                       &dr.h_wire));
+       TALER_JSON_merchant_wire_signature_hash (ds->wire_details,
+                                                &dr.h_wire));
     dr.timestamp = GNUNET_TIME_absolute_hton (timestamp);
     dr.refund_deadline = GNUNET_TIME_absolute_hton
       (refund_deadline);
diff --git a/src/exchange-lib/testing_api_cmd_track.c b/src/exchange-lib/testing_api_cmd_track.c
index 8ce9b7bc4..c7fbf4086 100644
--- a/src/exchange-lib/testing_api_cmd_track.c
+++ b/src/exchange-lib/testing_api_cmd_track.c
@@ -328,8 +328,8 @@ track_transaction_run (void *cls,
   /* Should not fail here, json has been parsed already */
   GNUNET_assert
     ( (GNUNET_OK ==
-       TALER_JSON_wire_signature_hash (wire_details,
-                                       &h_wire_details)) &&
+       TALER_JSON_merchant_wire_signature_hash (wire_details,
+                                                &h_wire_details)) &&
       (GNUNET_OK ==
        TALER_JSON_hash (j_contract_terms,
                         &h_contract_terms)) );
@@ -614,8 +614,10 @@ track_transfer_cb
         return;
       }
 
-      if (GNUNET_OK != TALER_TESTING_get_trait_wire_details
-        (wire_details_cmd, 0, &wire_details))
+      if (GNUNET_OK !=
+          TALER_TESTING_get_trait_wire_details (wire_details_cmd,
+                                                0,
+                                                &wire_details))
       {
         GNUNET_break (0);
         TALER_TESTING_interpreter_fail (is);
@@ -623,9 +625,9 @@ track_transfer_cb
       }
 
       GNUNET_assert
-        (GNUNET_OK == TALER_JSON_wire_signature_hash
-          (wire_details,
-           &h_wire_details));
+        (GNUNET_OK ==
+         TALER_JSON_merchant_wire_signature_hash (wire_details,
+                                                  &h_wire_details));
 
       if (0 != memcmp (&h_wire_details,
                        h_wire,