summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2020-01-16 12:13:11 +0100
committerMarcello Stanisci <stanisci.m@gmail.com>2020-01-16 12:13:11 +0100
commitf13b8e4db68d3f520a8265c5f5b108baf2eea1e6 (patch)
tree8a8c1f623aaf080bad3852527002f78c0de5d0a3 /src
parentabccaf2cd0d2528513947962470410c86cb76657 (diff)
downloadexchange-f13b8e4db68d3f520a8265c5f5b108baf2eea1e6.tar.gz
exchange-f13b8e4db68d3f520a8265c5f5b108baf2eea1e6.tar.bz2
exchange-f13b8e4db68d3f520a8265c5f5b108baf2eea1e6.zip
more comments and CMD state
Diffstat (limited to 'src')
-rw-r--r--src/include/taler_testing_lib.h12
-rw-r--r--src/lib/testing_api_cmd_insert_deposit.c44
2 files changed, 46 insertions, 10 deletions
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index 623e94ceb..48214aed5 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -1668,17 +1668,19 @@ TALER_TESTING_cmd_connect_with_state (const char *label,
*
* @param label command label.
* @param config_filename configuration filename.
- * @param TODO
- * @param TODO
- * @param TODO
- * @param TODO
+ * @param merchant_name Human-readable name of the merchant.
+ * @param merchant_account value indicating the merchant at its bank.
+ * @param wire_deadline point in time where the aggregator should have
+ * wired money to the merchant.
+ * @param amount_with_fee amount to deposit (inclusive of deposit fee)
+ * @param deposit_fee deposit fee
* @return the command.
*/
struct TALER_TESTING_Command
TALER_TESTING_cmd_insert_deposit (const char *label,
const char *config_filename,
const char *merchant_name,
- unsigned int merchant_account,
+ const char *merchant_account,
struct GNUNET_TIME_Absolute wire_deadline,
const char *amount_with_fee,
const char *deposit_fee);
diff --git a/src/lib/testing_api_cmd_insert_deposit.c b/src/lib/testing_api_cmd_insert_deposit.c
index cf82979d1..f83e98232 100644
--- a/src/lib/testing_api_cmd_insert_deposit.c
+++ b/src/lib/testing_api_cmd_insert_deposit.c
@@ -40,6 +40,32 @@ struct InsertDepositState
* Configuration file used by the command.
*/
const char *config_filename;
+
+ /**
+ * Human-readable name of the shop.
+ */
+ const char *merchant_name;
+
+ /**
+ * Merchant bank account (FIXME: payto, non-payto?)
+ */
+ const char *merchant_account;
+
+ /**
+ * Deadline before which the aggregator should
+ * send the payment to the merchant.
+ */
+ struct GNUNET_TIME_Absolute wire_deadline;
+
+ /**
+ * Amount to deposit, inclusive of deposit fee.
+ */
+ const char *amount_with_fee;
+
+ /**
+ * Deposit fee.
+ */
+ const char *deposit_fee;
};
@@ -110,17 +136,19 @@ insert_deposit_traits (void *cls,
*
* @param label command label.
* @param config_filename configuration filename.
- * @param TODO
- * @param TODO
- * @param TODO
- * @param TODO
+ * @param merchant_name Human-readable name of the merchant.
+ * @param merchant_account value indicating the merchant at its bank.
+ * @param wire_deadline point in time where the aggregator should have
+ * wired money to the merchant.
+ * @param amount_with_fee amount to deposit (inclusive of deposit fee)
+ * @param deposit_fee deposit fee
* @return the command.
*/
struct TALER_TESTING_Command
TALER_TESTING_cmd_insert_deposit (const char *label,
const char *config_filename,
const char *merchant_name,
- unsigned int merchant_account,
+ const char *merchant_account,
struct GNUNET_TIME_Absolute wire_deadline,
const char *amount_with_fee,
const char *deposit_fee)
@@ -130,6 +158,12 @@ TALER_TESTING_cmd_insert_deposit (const char *label,
ds = GNUNET_new (struct InsertDepositState);
ds->config_filename = config_filename;
+ ds->merchant_name = merchant_name;
+ ds->merchant_account = merchant_account;
+ ds->wire_deadline = wire_deadline;
+ ds->amount_with_fee = amount_with_fee;
+ ds->deposit_fee = deposit_fee;
+
cmd.cls = ds;
cmd.label = label;
cmd.run = &insert_deposit_run;