plugins: Updated Makefile for SQL plugin

Author: ShahanaFarooqui

contrib/msggen/msggen/utils/utils.py

@@ -182,8 +182,8 @@ def combine_schemas(schema_dir: Path, dest: Path):
     # Parse methods
     files = sorted(list(schema_dir.iterdir()))
     for f in files:
-        # Ignore lightning-sql.json because it will be auto generated by sql plugin and lightning-sql-template.json
-        if not f.name.endswith(".json") or f.name == "lightning-sql.json":
+        # Ignore sql.json because it will be auto generated by sql plugin and sql-template.json
+        if not f.name.endswith(".json") or f.name == "sql.json":
             continue
         methods[f.name] = json.load(f.open())
 
@@ -222,7 +222,7 @@ def check_missing():
     """
     schema = get_schema_bundle()
     command_names = set(
-        full_name.replace("lightning-", "").replace(".json", "") for full_name in schema["methods"].keys()
+        full_name.replace(".json", "") for full_name in schema["methods"].keys()
     )
     lower_method_names = set(name.lower() for name in grpc_method_names)
     return command_names - lower_method_names
@@ -232,7 +232,7 @@ def load_jsonrpc_method(name):
     """Load a method based on the file naming conventions for the JSON-RPC.
     """
     schema = get_schema_bundle()
-    rpc_name = f"lightning-{name.lower()}.json"
+    rpc_name = f"{name.lower()}.json"
     request = CompositeField.from_js(schema["methods"][rpc_name]['request'], path=name)
     response = CompositeField.from_js(schema["methods"][rpc_name]['response'], path=name)
 

plugins/Makefile

@@ -252,7 +252,7 @@ plugins/recklessrpc: $(PLUGIN_RECKLESSRPC_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMM
 
 # This covers all the low-level list RPCs which return simple arrays
 SQL_LISTRPCS := listchannels listforwards listhtlcs listinvoices listnodes listoffers listpeers listpeerchannels listclosedchannels listtransactions listsendpays bkpr-listaccountevents bkpr-listincome
-SQL_LISTRPCS_SCHEMAS := $(foreach l,$(SQL_LISTRPCS),doc/schemas/lightning-$l.json)
+SQL_LISTRPCS_SCHEMAS := $(foreach l,$(SQL_LISTRPCS),doc/schemas/$l.json)
 SQL_SCHEMA_PARTS := $(foreach l,$(SQL_LISTRPCS), plugins/sql-schema_$l_gen.h)
 
 # RES_JSON is generated by:
@@ -261,7 +261,7 @@ SQL_SCHEMA_PARTS := $(foreach l,$(SQL_LISTRPCS), plugins/sql-schema_$l_gen.h)
 # (We only need [field].type, [field].name, [field].deprecated, [field].allOf, [field].items.allOf and allOf from response.properties)
 # 3: deleting empty objects from .response.properties
 # But these simple removals drop us from 100k to 18k.
-plugins/sql-schema_%_gen.h: doc/schemas/lightning-%.json
+plugins/sql-schema_%_gen.h: doc/schemas/%.json
 	@jq 'walk(if type == "object" then if has("description") and (.description | type) == "array" then del(.description) else . end else . end ) | walk(if type == "object" then del(.additionalProperties, .required, .enum, .maxLength, .minLength, .pre_return_value_notes, .post_return_value_notes, .anyOf, .oneOf, .hidden, .untyped, .default, .comment, .added, .maximum, .minimum, .pattern, .format) else . end) | walk(if type == "object" then with_entries(select(.value != {})) else . end) | .response.properties' < $< > $@
 
 # Regen if these rules change!