peer storage: advertise features as optional

endothermicdev · rustyrussell · commit 2c7ceb8a2151 · 2023-02-14T06:21:44.000+10:30
Fixes: #6002 Changelog-None
diff --git a/lightningd/options.c b/lightningd/options.c
@@ -1081,9 +1081,11 @@ static char *opt_set_shutdown_wrong_funding(struct lightningd *ld)
 static char *opt_set_peer_storage(struct lightningd *ld)
 {
 	feature_set_or(ld->our_features,
-		       take(feature_set_for_feature(NULL, OPT_PROVIDE_PEER_BACKUP_STORAGE)));
+		       take(feature_set_for_feature(NULL,
+						    OPTIONAL_FEATURE(OPT_PROVIDE_PEER_BACKUP_STORAGE))));
 	feature_set_or(ld->our_features,
-		       take(feature_set_for_feature(NULL, OPT_WANT_PEER_BACKUP_STORAGE)));
+		       take(feature_set_for_feature(NULL,
+						    OPTIONAL_FEATURE(OPT_WANT_PEER_BACKUP_STORAGE))));
 	return NULL;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1081,9 +1081,11 @@ static char opt_set_shutdown_wrong_funding(struct lightningd ld)`
`1081`	`1081`	`static char opt_set_peer_storage(struct lightningd ld)`
`1082`	`1082`	`{`
`1083`	`1083`	`feature_set_or(ld->our_features,`
`1084`		`- take(feature_set_for_feature(NULL, OPT_PROVIDE_PEER_BACKUP_STORAGE)));`
	`1084`	`+ take(feature_set_for_feature(NULL,`
	`1085`	`+ OPTIONAL_FEATURE(OPT_PROVIDE_PEER_BACKUP_STORAGE))));`
`1085`	`1086`	`feature_set_or(ld->our_features,`
`1086`		`- take(feature_set_for_feature(NULL, OPT_WANT_PEER_BACKUP_STORAGE)));`
	`1087`	`+ take(feature_set_for_feature(NULL,`
	`1088`	`+ OPTIONAL_FEATURE(OPT_WANT_PEER_BACKUP_STORAGE))));`
`1087`	`1089`	`return NULL;`
`1088`	`1090`	`}`
`1089`	`1091`