wallet: Add missing description field to the invoices iteration

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - JSON API:`listnodes` has new field `global_features`.
 - Protocol: gossipd now deliberately delays spamming with `channel_update`.
 - Config: `--conf` option to set config file.
+- JSON API: Added description to invoices and payments (#1740).
 
 ### Changed
 

wallet/invoices.c

@@ -14,6 +14,8 @@
 #include <sqlite3.h>
 #include <string.h>
 
+#define INVOICE_TBL_FIELDS "state, payment_key, payment_hash, label, msatoshi, expiry_time, pay_index, msatoshi_received, paid_timestamp, bolt11, description"
+
 struct invoice_waiter {
 	/* Is this waiter already triggered? */
 	bool triggered;
@@ -475,11 +477,8 @@ bool invoices_iterate(struct invoices *invoices,
 	sqlite3_stmt *stmt;
 	int res;
 	if (!it->p) {
-		stmt = db_prepare(invoices->db,
+		stmt = db_prepare(invoices->db, "SELECT " INVOICE_TBL_FIELDS
-				  "SELECT state, payment_key, payment_hash"
+						" FROM invoices;");
-				  "     , label, msatoshi, expiry_time, pay_index"
-				  "     , msatoshi_received, paid_timestamp, bolt11"
-				  "  FROM invoices;");
 		it->p = stmt;
 	} else
 		stmt = it->p;
@@ -648,11 +647,8 @@ const struct invoice_details *invoices_get_details(const tal_t *ctx,
 	struct invoice_details *details;
 
 	stmt = db_prepare(invoices->db,
-			  "SELECT state, payment_key, payment_hash"
+			  "SELECT " INVOICE_TBL_FIELDS
-			  "     , label, msatoshi, expiry_time, pay_index"
+			  " FROM invoices"
-			  "     , msatoshi_received, paid_timestamp, bolt11"
-			  "     , description"
-			  "  FROM invoices"
 			  " WHERE id = ?;");
 	sqlite3_bind_int64(stmt, 1, invoice.id);
 	result = sqlite3_step(stmt);