diff options
| author | Christian Grothoff <christian@grothoff.org> | 2017-06-11 15:24:53 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-06-11 15:24:53 +0200 |
| commit | c08137c3deb4bc9e2059d027db5c15e5431d98d9 (patch) | |
| tree | c1e830c9e0a28e74ac87dfeced17cdf035ce9cf0 | |
| parent | 101b493c7d2bb902aaf871f3ca984303ec9250d6 (diff) | |
| download | merchant-c08137c3deb4bc9e2059d027db5c15e5431d98d9.tar.gz merchant-c08137c3deb4bc9e2059d027db5c15e5431d98d9.tar.bz2 merchant-c08137c3deb4bc9e2059d027db5c15e5431d98d9.zip | |
make adjustments to fakebank API change
| -rw-r--r-- | src/lib/test_merchant_api.c | 51 |
1 files changed, 32 insertions, 19 deletions
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c index 4b157eec..13cb113a 100644 --- a/src/lib/test_merchant_api.c +++ b/src/lib/test_merchant_api.c @@ -522,9 +522,9 @@ struct Command uint64_t account_credit; /** - * Set (!) to the wire transfer identifier observed. + * Set (!) to the wire transfer subject observed. */ - struct TALER_WireTransferIdentifierRawP wtid; + char *subject; } check_bank_transfer; @@ -1465,6 +1465,8 @@ cleanup_state (struct InterpreterState *is) } break; case OC_CHECK_BANK_TRANSFER: + GNUNET_free_non_null (cmd->details.check_bank_transfer.subject); + cmd->details.check_bank_transfer.subject = NULL; break; case OC_CHECK_BANK_TRANSFERS_EMPTY: break; @@ -1944,11 +1946,11 @@ interpreter_run (void *cls) } if (GNUNET_OK != TALER_FAKEBANK_check (fakebank, - &amount, - cmd->details.check_bank_transfer.account_debit, - cmd->details.check_bank_transfer.account_credit, - EXCHANGE_URI, - &cmd->details.check_bank_transfer.wtid)) + &amount, + cmd->details.check_bank_transfer.account_debit, + cmd->details.check_bank_transfer.account_credit, + EXCHANGE_URI, + &cmd->details.check_bank_transfer.subject)) { GNUNET_break (0); fail (is); @@ -1970,18 +1972,29 @@ interpreter_run (void *cls) return; } case OC_TRACK_TRANSFER: - ref = find_command (is, - cmd->details.track_transfer.check_bank_ref); - GNUNET_assert (NULL != ref); - cmd->details.track_transfer.tdo = - TALER_MERCHANT_track_transfer (ctx, - MERCHANT_URI, - instance, - &ref->details.check_bank_transfer.wtid, - EXCHANGE_URI, - &track_transfer_cb, - is); - return; + { + struct TALER_WireTransferIdentifierRawP wtid; + const char *subject; + + ref = find_command (is, + cmd->details.track_transfer.check_bank_ref); + GNUNET_assert (NULL != ref); + subject = ref->details.check_bank_transfer.subject; + GNUNET_assert (GNUNET_OK == + GNUNET_STRINGS_string_to_data (subject, + strlen (subject), + &wtid, + sizeof (wtid))); + cmd->details.track_transfer.tdo + = TALER_MERCHANT_track_transfer (ctx, + MERCHANT_URI, + instance, + &wtid, + EXCHANGE_URI, + &track_transfer_cb, + is); + return; + } case OC_TRACK_TRANSACTION: { const struct Command *proposal_ref; |