simplify pending transactions, make more tests pass again

1 files changed, 12 insertions, 40 deletions

diff --git a/packages/taler-wallet-core/src/db.ts b/packages/taler-wallet-core/src/db.ts
index d02ea192f..ca613e5e5 100644
--- a/packages/taler-wallet-core/src/db.ts
+++ b/packages/taler-wallet-core/src/db.ts
@@ -515,25 +515,11 @@ export interface DenominationRecord {
   exchangeBaseUrl: string;
 }
 
-export enum ExchangeUpdateStatus {
-  FetchKeys = "fetch-keys",
-  FetchWire = "fetch-wire",
-  FetchTerms = "fetch-terms",
-  FinalizeUpdate = "finalize-update",
-  Finished = "finished",
-}
-
 export interface ExchangeBankAccount {
   payto_uri: string;
   master_sig: string;
 }
 
-export enum ExchangeUpdateReason {
-  Initial = "initial",
-  Forced = "forced",
-  Scheduled = "scheduled",
-}
-
 export interface ExchangeDetailsRecord {
   /**
    * Master public key of the exchange.
@@ -582,16 +568,6 @@ export interface ExchangeDetailsRecord {
    */
   termsOfServiceAcceptedEtag: string | undefined;
 
-  /**
-   * Timestamp for last update.
-   */
-  lastUpdateTime: Timestamp;
-
-  /**
-   * When should we next update the information about the exchange?
-   */
-  nextUpdateTime: Timestamp;
-
   wireInfo: WireInfo;
 }
 
@@ -629,20 +605,24 @@ export interface ExchangeRecord {
   permanent: boolean;
 
   /**
-   * Time when the update to the exchange has been started or
-   * undefined if no update is in progress.
+   * Last time when the exchange was updated.
    */
-  updateStarted: Timestamp | undefined;
+  lastUpdate: Timestamp | undefined;
 
   /**
-   * Status of updating the info about the exchange.
+   * Next scheduled update for the exchange.
    *
-   * FIXME:  Adapt this to recent changes regarding how
-   * updating exchange details works.
+   * (This field must always be present, so we can index on the timestamp.)
    */
-  updateStatus: ExchangeUpdateStatus;
+  nextUpdate: Timestamp;
 
-  updateReason?: ExchangeUpdateReason;
+  /**
+   * Next time that we should check if coins need to be refreshed.
+   *
+   * Updated whenever the exchange's denominations are updated or when
+   * the refresh check has been done.
+   */
+  nextRefreshCheck: Timestamp;
 
   lastError?: TalerErrorDetails;
 
@@ -650,14 +630,6 @@ export interface ExchangeRecord {
    * Retry status for fetching updated information about the exchange.
    */
   retryInfo: RetryInfo;
-
-  /**
-   * Next time that we should check if coins need to be refreshed.
-   *
-   * Updated whenever the exchange's denominations are updated or when
-   * the refresh check has been done.
-   */
-  nextRefreshCheck?: Timestamp;
 }
 
 /**