-remove dead / never existing reserve history transaction type

1 files changed, 56 insertions, 98 deletions

diff --git a/core/api-exchange.rst b/core/api-exchange.rst
index 68528fb7..34f6957a 100644
--- a/core/api-exchange.rst
+++ b/core/api-exchange.rst
@@ -1294,7 +1294,6 @@ exchange.
 
     // Union discriminated by the "type" field.
     type TransactionHistoryItem =
-      | AccountMergeTransaction
       | AccountSetupTransaction
       | ReserveHistoryTransaction
       | ReserveWithdrawTransaction
@@ -1304,72 +1303,6 @@ exchange.
       | ReserveCloseRequestTransaction
       | PurseMergeTransaction;
 
-  .. ts:def:: PurseMergeTransaction
-
-    interface PurseMergeTransaction {
-      type: "MERGE";
-
-      // SHA-512 hash of the contact of the purse.
-      h_contract_terms: HashCode;
-
-      // EdDSA public key used to approve merges of this purse.
-      merge_pub: EddsaPublicKey;
-
-      // Minimum age required for all coins deposited into the purse.
-      min_age: Integer;
-
-      // Number that identifies who created the purse
-      // and how it was paid for.
-      flags: Integer;
-
-      // Purse public key.
-      purse_pub: EddsaPublicKey;
-
-      // EdDSA signature of the account/reserve affirming the merge
-      // over a `TALER_AccountMergeSignaturePS`.
-      // Must be of purpose ``TALER_SIGNATURE_ACCOUNT_MERGE``
-      reserve_sig: EddsaSignature;
-
-      // Client-side timestamp of when the merge request was made.
-      merge_timestamp: Timestamp;
-
-      // Indicative time by which the purse should expire
-      // if it has not been merged into an account. At this
-      // point, all of the deposits made should be
-      // auto-refunded.
-      purse_expiration: Timestamp;
-
-      // Purse fee the reserve owner paid for the purse creation.
-      purse_fee: Amount;
-
-      // Total amount merged into the reserve.
-      // (excludes fees).
-      amount: Amount;
-
-      // True if the purse was actually merged.
-      // If false, only the purse_fee has an impact
-      // on the reserve balance!
-      merged: boolean;
-    }
-
-  .. ts:def:: ReserveHistoryTransaction
-
-    interface ReserveHistoryTransaction {
-      type: "HISTORY";
-
-      // Fee agreed to by the reserve owner.
-      amount: Amount;
-
-      // Time when the request was made.
-      request_timestamp: Timestamp;
-
-      // Signature created with the reserve's private key.
-      // Must be of purpose ``TALER_SIGNATURE_RESERVE_HISTORY_REQUEST`` over
-      // a `TALER_ReserveHistoryRequestSignaturePS`.
-      reserve_sig: EddsaSignature;
-
-    }
-
   .. ts:def:: AccountSetupTransaction
 
     interface AccountSetupTransaction {
@@ -1395,45 +1328,22 @@ exchange.
 
     }
 
-  .. ts:def:: AccountMergeTransaction
+  .. ts:def:: ReserveHistoryTransaction
 
-    interface AccountMergeTransaction {
-      type: "MERGE";
+    interface ReserveHistoryTransaction {
+      type: "HISTORY";
 
-      // Actual amount merged (what was left after fees).
+      // Fee agreed to by the reserve owner.
       amount: Amount;
 
-      // Minimum amount merged (amount signed by the
-      // reserve and purse signatures).
-      minimum_amount: Amount;
-
-      // Purse that was merged.
-      purse_pub: EddsaPublicKey;
-
-      // Time of the merge.
-      merge_timestamp: Timestamp;
-
-      // Expiration time of the purse.
-      purse_expiration: Timestamp;
-
-      // Hash of the contract.
-      h_contract: HashCode;
-
-      // Hash of the wire details of the reserve.
-      h_wire: HashCode;
+      // Time when the request was made.
+      request_timestamp: Timestamp;
 
       // Signature created with the reserve's private key.
-      // Must be of purpose ``TALER_SIGNATURE_ACCOUNT_MERGE`` over
-      // a `TALER_AccountMergeSignaturePS`.
+      // Must be of purpose ``TALER_SIGNATURE_RESERVE_HISTORY_REQUEST`` over
+      // a `TALER_ReserveHistoryRequestSignaturePS`.
       reserve_sig: EddsaSignature;
 
-      // Signature created with the purse's private key.
-      // Must be of purpose ``TALER_SIGNATURE_PURSE_MERGE``
-      // over a `TALER_PurseMergeSignaturePS`.
-      purse_sig: EddsaSignature;
-
-      // Deposit fees that were charged to the purse.
-      deposit_fees: Amount;
     }
 
   .. ts:def:: ReserveWithdrawTransaction
@@ -1570,6 +1480,54 @@ exchange.
       timestamp: Timestamp;
     }
 
+  .. ts:def:: PurseMergeTransaction
+
+    interface PurseMergeTransaction {
+      type: "MERGE";
+
+      // SHA-512 hash of the contact of the purse.
+      h_contract_terms: HashCode;
+
+      // EdDSA public key used to approve merges of this purse.
+      merge_pub: EddsaPublicKey;
+
+      // Minimum age required for all coins deposited into the purse.
+      min_age: Integer;
+
+      // Number that identifies who created the purse
+      // and how it was paid for.
+      flags: Integer;
+
+      // Purse public key.
+      purse_pub: EddsaPublicKey;
+
+      // EdDSA signature of the account/reserve affirming the merge
+      // over a `TALER_AccountMergeSignaturePS`.
+      // Must be of purpose ``TALER_SIGNATURE_ACCOUNT_MERGE``
+      reserve_sig: EddsaSignature;
+
+      // Client-side timestamp of when the merge request was made.
+      merge_timestamp: Timestamp;
+
+      // Indicative time by which the purse should expire
+      // if it has not been merged into an account. At this
+      // point, all of the deposits made should be
+      // auto-refunded.
+      purse_expiration: Timestamp;
+
+      // Purse fee the reserve owner paid for the purse creation.
+      purse_fee: Amount;
+
+      // Total amount merged into the reserve.
+      // (excludes fees).
+      amount: Amount;
+
+      // True if the purse was actually merged.
+      // If false, only the purse_fee has an impact
+      // on the reserve balance!
+      merged: boolean;
+    }
+
 
 .. http:post:: /reserves/$RESERVE_PUB/history