listtransactions: remove annotations, which were only in EXPERIMENTAL_FEATURES.

I don't know if anyone was using them, they seem half-hearted.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

doc/Makefile

@@ -237,7 +237,7 @@ schema-added-check:
 	fi
 schema-removed-check:
 	@if ! test -z $$CI; then git fetch origin master; fi; \
-	if git diff origin/master -- doc/schemas | grep -q '^-.*{' && ! git diff origin/master -- doc/schemas | grep -q '^-.*"deprecated"'; then \
+	if git diff origin/master -- doc/schemas | grep -q '^-.*{' && ! git diff origin/master -- doc/schemas | grep -q '^-.*"deprecated"' && ! git diff origin/master -- doc/schemas | grep -q '^-.*EXPERIMENTAL_FEATURES'; then \
 		git diff origin/master -- doc/schemas ; \
 		echo 'Schema fields must be "deprecated", with version, not removed' >&2; exit 1; \
 	fi

doc/lightning-listtransactions.7.md

@@ -37,14 +37,10 @@ On success, an object containing **transactions** is returned.  It is an array o
   - **txid** (txid): the transaction id spent
   - **index** (u32): the output spent
   - **sequence** (u32): the nSequence value
-  - **type** (string, optional): the purpose of this input (*EXPERIMENTAL\_FEATURES* only) (one of "theirs", "deposit", "withdraw", "channel\_funding", "channel\_mutual\_close", "channel\_unilateral\_close", "channel\_sweep", "channel\_htlc\_success", "channel\_htlc\_timeout", "channel\_penalty", "channel\_unilateral\_cheat")
-  - **channel** (short\_channel\_id, optional): the channel this input is associated with (*EXPERIMENTAL\_FEATURES* only)
 - **outputs** (array of objects): Each output, in order:
   - **index** (u32): the 0-based output number
   - **amount\_msat** (msat): the amount of the output
   - **scriptPubKey** (hex): the scriptPubKey
-  - **type** (string, optional): the purpose of this output (*EXPERIMENTAL\_FEATURES* only) (one of "theirs", "deposit", "withdraw", "channel\_funding", "channel\_mutual\_close", "channel\_unilateral\_close", "channel\_sweep", "channel\_htlc\_success", "channel\_htlc\_timeout", "channel\_penalty", "channel\_unilateral\_cheat")
-  - **channel** (short\_channel\_id, optional): the channel this output is associated with (*EXPERIMENTAL\_FEATURES* only)
 
 [comment]: # (GENERATE-FROM-SCHEMA-END)
 
@@ -103,4 +99,4 @@ RESOURCES
 
 Main web site: <https://github.com/ElementsProject/lightning>
 
-[comment]: # ( SHA256STAMP:525f24511eb9687dc16d5b2156d4d8df28b371e287512a749d2d9dfd5701e093)
+[comment]: # ( SHA256STAMP:6431aec91a48a5f9d4632baa6f3aae23dee8607a200b3c359d679028e521b588)

doc/lightning-sql.7.md

@@ -379,16 +379,12 @@ The following tables are currently supported:
     - `txid` (type `txid`, sqltype `BLOB`)
     - `idx` (type `u32`, sqltype `INTEGER`, from JSON field `index`)
     - `sequence` (type `u32`, sqltype `INTEGER`)
-    - `type` (type `string`, sqltype `TEXT`)
-    - `channel` (type `short_channel_id`, sqltype `TEXT`)
   - related table `transactions_outputs`
     - `row` (reference to `transactions.rowid`, sqltype `INTEGER`)
     - `arrindex` (index within array, sqltype `INTEGER`)
     - `idx` (type `u32`, sqltype `INTEGER`, from JSON field `index`)
     - `amount_msat` (type `msat`, sqltype `INTEGER`)
     - `scriptPubKey` (type `hex`, sqltype `BLOB`)
-    - `type` (type `string`, sqltype `TEXT`)
-    - `channel` (type `short_channel_id`, sqltype `TEXT`)
 
 [comment]: # (GENERATE-DOC-END)
 
@@ -514,4 +510,4 @@ RESOURCES
 ---------
 
 Main web site: <https://github.com/ElementsProject/lightning>
-[comment]: # ( SHA256STAMP:3eb4e024a1e1a4b40460b48b835354514456558797b8f8ce3c76dcbb9ca79dab)
+[comment]: # ( SHA256STAMP:68c72c66bdc8b0515c6d5dddd5ffd14aa0342bd00f17a44929177c48c36a213f)

doc/schemas/listtransactions.schema.json

@@ -69,27 +69,6 @@
                 "sequence": {
                   "type": "u32",
                   "description": "the nSequence value"
-                },
-                "type": {
-                  "type": "string",
-                  "enum": [
-                    "theirs",
-                    "deposit",
-                    "withdraw",
-                    "channel_funding",
-                    "channel_mutual_close",
-                    "channel_unilateral_close",
-                    "channel_sweep",
-                    "channel_htlc_success",
-                    "channel_htlc_timeout",
-                    "channel_penalty",
-                    "channel_unilateral_cheat"
-                  ],
-                  "description": "the purpose of this input (*EXPERIMENTAL_FEATURES* only)"
-                },
-                "channel": {
-                  "type": "short_channel_id",
-                  "description": "the channel this input is associated with (*EXPERIMENTAL_FEATURES* only)"
                 }
               }
             }
@@ -117,27 +96,6 @@
                 "scriptPubKey": {
                   "type": "hex",
                   "description": "the scriptPubKey"
-                },
-                "type": {
-                  "type": "string",
-                  "enum": [
-                    "theirs",
-                    "deposit",
-                    "withdraw",
-                    "channel_funding",
-                    "channel_mutual_close",
-                    "channel_unilateral_close",
-                    "channel_sweep",
-                    "channel_htlc_success",
-                    "channel_htlc_timeout",
-                    "channel_penalty",
-                    "channel_unilateral_cheat"
-                  ],
-                  "description": "the purpose of this output (*EXPERIMENTAL_FEATURES* only)"
-                },
-                "channel": {
-                  "type": "short_channel_id",
-                  "description": "the channel this output is associated with (*EXPERIMENTAL_FEATURES* only)"
                 }
               }
             }