summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-01-28 03:58:21 +0100
committerChristian Grothoff <christian@grothoff.org>2016-01-28 03:58:21 +0100
commit46d9cc367bdc9bf8cda7ae12e78ea0a2e0853d36 (patch)
treeff13f79a4c570c1fe63050665e3c3398dc6d9a11 /src/include
parent4506b4878ffb4f827cd0be0ab7587ed3654edd0d (diff)
downloadexchange-46d9cc367bdc9bf8cda7ae12e78ea0a2e0853d36.tar.gz
exchange-46d9cc367bdc9bf8cda7ae12e78ea0a2e0853d36.tar.bz2
exchange-46d9cc367bdc9bf8cda7ae12e78ea0a2e0853d36.zip
finishing core logic for #4141, but untested
Diffstat (limited to 'src/include')
-rw-r--r--src/include/taler_mint_service.h5
-rw-r--r--src/include/taler_mintdb_plugin.h6
-rw-r--r--src/include/taler_signatures.h14
3 files changed, 2 insertions, 23 deletions
diff --git a/src/include/taler_mint_service.h b/src/include/taler_mint_service.h
index b151cb00..1502edfb 100644
--- a/src/include/taler_mint_service.h
+++ b/src/include/taler_mint_service.h
@@ -1173,8 +1173,6 @@ struct TALER_MINT_DepositWtidHandle;
* yet execute the transaction
* @param execution_time actual or planned execution time for the wire transfer
* @param coin_contribution contribution to the @a total_amount of the deposited coin (may be NULL)
- * @param total_amount total amount of the wire transfer, or NULL if the mint could
- * not provide any @a wtid (set only if @a http_status is #MHD_HTTP_OK)
*/
typedef void
(*TALER_MINT_DepositWtidCallback)(void *cls,
@@ -1182,8 +1180,7 @@ typedef void
json_t *json,
const struct TALER_WireTransferIdentifierRawP *wtid,
struct GNUNET_TIME_Absolute execution_time,
- const struct TALER_Amount *coin_contribution,
- const struct TALER_Amount *total_amount);
+ const struct TALER_Amount *coin_contribution);
/**
diff --git a/src/include/taler_mintdb_plugin.h b/src/include/taler_mintdb_plugin.h
index 7c48114b..d2cc3d76 100644
--- a/src/include/taler_mintdb_plugin.h
+++ b/src/include/taler_mintdb_plugin.h
@@ -583,7 +583,6 @@ typedef void
* @param coin_contribution how much did the coin we asked about
* contribute to the total transfer value? (deposit value including fee)
* @param coin_fee how much did the mint charge for the deposit fee
- * @param total_amount how much was the total wire transfer?
* @param execution_time when was the transaction done, or
* when we expect it to be done (if @a wtid was NULL)
*/
@@ -592,7 +591,6 @@ typedef void
const struct TALER_WireTransferIdentifierRawP *wtid,
const struct TALER_Amount *coin_contribution,
const struct TALER_Amount *coin_fee,
- const struct TALER_Amount *total_amount,
struct GNUNET_TIME_Absolute execution_time);
@@ -1360,7 +1358,6 @@ struct TALER_MINTDB_Plugin
* @param coin_pub which public key was this payment about
* @param coin_value amount contributed by this coin in total
* @param coin_fee deposit fee charged by mint for this coin
- * @param transfer_value total amount of the wire transfer
* @return #GNUNET_OK on success, #GNUNET_SYSERR on DB errors
*/
int
@@ -1374,8 +1371,7 @@ struct TALER_MINTDB_Plugin
struct GNUNET_TIME_Absolute execution_time,
const struct TALER_CoinSpendPublicKeyP *coin_pub,
const struct TALER_Amount *coin_value,
- const struct TALER_Amount *coin_fee,
- const struct TALER_Amount *transfer_value);
+ const struct TALER_Amount *coin_fee);
/**
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
index 85c681da..2526597e 100644
--- a/src/include/taler_signatures.h
+++ b/src/include/taler_signatures.h
@@ -953,20 +953,6 @@ struct TALER_ConfirmWirePS
*/
struct TALER_AmountNBO coin_contribution;
- /**
- * The total amount the mint transferred in the transaction.
- * Note that we may be aggregating multiple coin's @e coin_contribution
- * values into a single wire transfer, so this value may be larger
- * than that of @e coin_contribution. It may also be smaller, as
- * @e coin_contribution may be say "1.123456" but the wire unit may
- * be rounded down, i.e. to "1.12" (depending on the transfer method).
- *
- * Note that the mint books the deltas from rounding down as profit,
- * so aggregating transfers is a good thing for the merchant (as it
- * reduces rounding down expenses).
- */
- struct TALER_AmountNBO total_amount;
-
};
GNUNET_NETWORK_STRUCT_END