lightningd: Updated offer methods

Author: ShahanaFarooqui

lightningd/offer.c

@@ -14,15 +14,12 @@ static void json_populate_offer(struct json_stream *response,
 				const struct sha256 *offer_id,
 				const char *b12,
 				const struct json_escape *label,
-				const char *description,
 				enum offer_status status)
 {
 	json_add_sha256(response, "offer_id", offer_id);
 	json_add_bool(response, "active", offer_status_active(status));
 	json_add_bool(response, "single_use", offer_status_single(status));
 	json_add_string(response, "bolt12", b12);
-	if (description)
-		json_add_string(response, "description", description);
 	json_add_bool(response, "used", offer_status_used(status));
 	if (label)
 		json_add_escaped_string(response, "label", label);
@@ -35,8 +32,8 @@ static const char *offer_description_from_b12(const tal_t *ctx,
     struct tlv_offer *offer;
     char *fail;
 
-    offer = offer_decode(ctx, b12, strlen(b12),
-                         ld->our_features, chainparams, &fail);
+	offer = offer_decode(ctx, b12, strlen(b12),
+                         NULL, NULL, &fail);
     if (!offer) {
         log_debug(ld->log, "Failed to decode BOLT12: %s", fail);
         return NULL;
@@ -45,7 +42,7 @@ static const char *offer_description_from_b12(const tal_t *ctx,
     if (!offer->offer_description)
         return NULL;
 
-    return (const char *)offer->offer_description;
+    return offer->offer_description;
 }
 
 static struct command_result *param_b12_offer(struct command *cmd,
@@ -137,8 +134,7 @@ static struct command_result *json_createoffer(struct command *cmd,
 		created = true;
 
 	response = json_stream_success(cmd);
-	json_populate_offer(response, &offer_id, b12str, label,
-					offer->offer_description, status);
+	json_populate_offer(response, &offer_id, b12str, label, status);
 	json_add_bool(response, "created", created);
 	return command_success(cmd, response);
 }
@@ -174,12 +170,14 @@ static struct command_result *json_listoffers(struct command *cmd,
 	if (offer_id) {
 		b12 = wallet_offer_find(tmpctx, wallet, offer_id, &label,
 					&status);
-		description = offer_description_from_b12(tmpctx, cmd->ld, b12);
 		if (b12 && offer_status_active(status) >= *active_only) {
 			json_object_start(response, NULL);
 			json_populate_offer(response,
 					    offer_id, b12,
-					    label, description, status);
+					    label, status);
+			description = offer_description_from_b12(tmpctx, cmd->ld, b12);
+			if (description)
+				json_add_stringn(response, "description", description, tal_bytelen(description));
 			json_object_end(response);
 		}
 	} else {
@@ -191,12 +189,14 @@ static struct command_result *json_listoffers(struct command *cmd,
 		     stmt = wallet_offer_id_next(cmd->ld->wallet, stmt, &id)) {
 			b12 = wallet_offer_find(tmpctx, wallet, &id,
 						&label, &status);
-			description = offer_description_from_b12(tmpctx, cmd->ld, b12);
 			if (offer_status_active(status) >= *active_only) {
 				json_object_start(response, NULL);
 				json_populate_offer(response,
 						    &id, b12,
-						    label, description, status);
+						    label, status);
+				description = offer_description_from_b12(tmpctx, cmd->ld, b12);
+				if (description)
+					json_add_stringn(response, "description", description, tal_bytelen(description));
 				json_object_end(response);
 			}
 		}
@@ -230,7 +230,6 @@ static struct command_result *json_disableoffer(struct command *cmd,
 		return command_param_failed();
 
 	b12 = wallet_offer_find(tmpctx, wallet, offer_id, &label, &status);
-	description = offer_description_from_b12(tmpctx, cmd->ld, b12);
 	if (!b12)
 		return command_fail(cmd, LIGHTNINGD, "Unknown offer");
 
@@ -244,7 +243,10 @@ static struct command_result *json_disableoffer(struct command *cmd,
 	status = wallet_offer_disable(wallet, offer_id, status);
 
 	response = json_stream_success(cmd);
-	json_populate_offer(response, offer_id, b12, label, description, status);
+	json_populate_offer(response, offer_id, b12, label, status);
+	description = offer_description_from_b12(tmpctx, cmd->ld, b12);
+	if (description)
+		json_add_stringn(response, "description", description, tal_bytelen(description));
 	return command_success(cmd, response);
 }
 
@@ -273,7 +275,6 @@ static struct command_result *json_enableoffer(struct command *cmd,
 		return command_param_failed();
 
 	b12 = wallet_offer_find(tmpctx, wallet, offer_id, &label, &status);
-	description = offer_description_from_b12(tmpctx, cmd->ld, b12);
 	if (!b12)
 		return command_fail(cmd, LIGHTNINGD, "Unknown offer");
 
@@ -287,7 +288,10 @@ static struct command_result *json_enableoffer(struct command *cmd,
 	status = wallet_offer_enable(wallet, offer_id, status);
 
 	response = json_stream_success(cmd);
-	json_populate_offer(response, offer_id, b12, label, description, status);
+	json_populate_offer(response, offer_id, b12, label, status);
+	description = offer_description_from_b12(tmpctx, cmd->ld, b12);
+	if (description)
+		json_add_stringn(response, "description", description, tal_bytelen(description));
 	return command_success(cmd, response);
 }