DD37: tip query happens before transaction is created!

2 files changed, 4 insertions, 43 deletions

diff --git a/design-documents/037-wallet-transactions-lifecycle.rst b/design-documents/037-wallet-transactions-lifecycle.rst
index 25dcde9b..338795bd 100644
--- a/design-documents/037-wallet-transactions-lifecycle.rst
+++ b/design-documents/037-wallet-transactions-lifecycle.rst
@@ -528,26 +528,12 @@ the same as if the double-spending transaction had been deleted by the user.
 Transaction Type: Tip
 ---------------------
 
-* ``pending(query)``
-
-  The wallet is downloading the metadata for the tip from the merchant to store it in the database.
-
-  * ``[failure] => deleted``: We only show a transient warning that the tip was invalid.
-  * ``[action:suspend] => suspended(pickup)``
-  * ``[success] => pending(user)``
-
-* ``suspended(query)``
-
-  The user suspended the operation to download the tip data.
-
-  * ``[action:resume] => pending(query)``
-
 * ``pending(user)``
 
-  We have downloaded the metadata for the tip. The user needs to accept/refuse
-  the tip.
+  We have downloaded the metadata for the tip.  This is the initial state for a
+  tip transaction. The user needs to accept/refuse the tip.
 
-  * ``[tip-expired] => failed``
+  * ``[tip-expired] => expired``
   * ``[action:accept] => pending(pickup)``
 
 * ``pending(pickup)``
diff --git a/transaction-tip-states.dot b/transaction-tip-states.dot
index 4fef0a03..476c8c74 100644
--- a/transaction-tip-states.dot
+++ b/transaction-tip-states.dot
@@ -1,36 +1,11 @@
 digraph G {
-
   initial[label="", shape="circle"];
-  pending_query[label="query"];
-  //aborting_query[label="query", style=dashed];
-  //aborted_query[label="aborted", style=dashed, shape=box];
   dialog_user[label="dialog(user)"];
   pending_pickup[label="pickup"];
-  //aborting_pickup[label="pickup", style=dashed];
-  //aborted_pickup[label="aborted", style=dashed, shape=box];
   done[label="done", shape="box"];
-  
-  // subgraph {
-  //   rank=same;
-  //   pending_query; dialog_user;
-  // }
-  
-  // subgraph {
-  //   rank=same;
-  //   done;
-  //   //aborted_pickup; aborted_query;
-  // }
 
-  initial -> pending_query;
-  
+  initial -> dialog_user;
   
   dialog_user -> pending_pickup [color=blue, label="OK"];
-
-  pending_query -> dialog_user [color=green];
-  //pending_query -> aborting_query;
-  //aborting_query -> aborted_query;
-
   pending_pickup -> done [color=green];
-  //pending_pickup -> aborting_pickup;
-  //aborting_pickup -> aborted_pickup;
 }