lightningd: remove delexpiredinvoice

Changelog-Removed: JSON-RPC: `delexpiredinvoice` (deprecated v22.11, EOL v24.02) Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ErikDeSmedt · Mar 25, 2024 · 7e0e394 · 7e0e394
1 parent 57e5947
commit 7e0e394
Show file tree

Hide file tree

Showing 23 changed files with 364 additions and 733 deletions.
diff --git a/cln-grpc/proto/node.proto b/cln-grpc/proto/node.proto
diff --git a/cln-grpc/src/convert.rs b/cln-grpc/src/convert.rs
diff --git a/cln-grpc/src/server.rs b/cln-grpc/src/server.rs
@@ -506,38 +506,6 @@ async fn del_datastore(
 
 }
 
-async fn del_expired_invoice(
-    &self,
-    request: tonic::Request<pb::DelexpiredinvoiceRequest>,
-) -> Result<tonic::Response<pb::DelexpiredinvoiceResponse>, tonic::Status> {
-    let req = request.into_inner();
-    let req: requests::DelexpiredinvoiceRequest = req.into();
-    debug!("Client asked for del_expired_invoice");
-    trace!("del_expired_invoice request: {:?}", req);
-    let mut rpc = ClnRpc::new(&self.rpc_path)
-        .await
-        .map_err(|e| Status::new(Code::Internal, e.to_string()))?;
-    let result = rpc.call(Request::DelExpiredInvoice(req))
-        .await
-        .map_err(|e| Status::new(
-           Code::Unknown,
-           format!("Error calling method DelExpiredInvoice: {:?}", e)))?;
-    match result {
-        Response::DelExpiredInvoice(r) => {
-           trace!("del_expired_invoice response: {:?}", r);
-           Ok(tonic::Response::new(r.into()))
-        },
-        r => Err(Status::new(
-            Code::Internal,
-            format!(
-                "Unexpected result {:?} to method call DelExpiredInvoice",
-                r
-            )
-        )),
-    }
-
-}
-
 async fn del_invoice(
     &self,
     request: tonic::Request<pb::DelinvoiceRequest>,

diff --git a/cln-rpc/src/model.rs b/cln-rpc/src/model.rs
diff --git a/contrib/msggen/msggen/schema.json b/contrib/msggen/msggen/schema.json
@@ -7932,53 +7932,6 @@
       "Main web site: <https://github.com/ElementsProject/lightning>"
     ]
   },
-  "lightning-delexpiredinvoice.json": {
-    "$schema": "../rpc-schema-draft.json",
-    "type": "object",
-    "additionalProperties": false,
-    "rpc": "delexpiredinvoice",
-    "title": "Command for removing expired invoices",
-    "description": [
-      "The **delexpiredinvoice** RPC command removes all invoices that have expired on or before the given *maxexpirytime*."
-    ],
-    "request": {
-      "required": [],
-      "properties": {
-        "maxexpirytime": {
-          "type": "u64",
-          "description": [
-            "Invoice expiry time in seconds. If not specified then all expired invoices are deleted."
-          ]
-        }
-      }
-    },
-    "response": {
-      "required": [],
-      "properties": {}
-    },
-    "example_json_request": [
-      {
-        "id": "example:delexpiredinvoice#1",
-        "method": "delexpiredinvoice",
-        "params": {
-          "maxexpirytime": null
-        }
-      }
-    ],
-    "example_json_response": [
-      {}
-    ],
-    "author": [
-      "ZmnSCPxj <<ZmnSCPxj@protonmail.com>> is mainly responsible."
-    ],
-    "see_also": [
-      "lightning-delinvoice(7)",
-      "lightning-autoclean-status(7)"
-    ],
-    "resources": [
-      "Main web site: <https://github.com/ElementsProject/lightning>"
-    ]
-  },
   "lightning-delforward.json": {
     "$schema": "../rpc-schema-draft.json",
     "type": "object",
@@ -8396,7 +8349,6 @@
       "lightning-listinvoice(7)",
       "lightning-waitinvoice(7)",
       "lightning-invoice(7)",
-      "lightning-delexpiredinvoice(7)",
       "lightning-autoclean-status(7)"
     ],
     "resources": [

diff --git a/contrib/msggen/msggen/utils/utils.py b/contrib/msggen/msggen/utils/utils.py
@@ -73,7 +73,6 @@ def load_jsonrpc_service():
         "DatastoreUsage",
         "CreateOnion",
         "DelDatastore",
-        "DelExpiredInvoice",
         "DelInvoice",
         "Invoice",
         "ListDatastore",

diff --git a/contrib/pyln-client/pyln/client/lightning.py b/contrib/pyln-client/pyln/client/lightning.py
@@ -607,15 +607,6 @@ def deldatastore(self, key, generation=None):
         }
         return self.call("deldatastore", payload)
 
-    def delexpiredinvoice(self, maxexpirytime=None):
-        """
-        Delete all invoices that have expired on or before the given {maxexpirytime}.
-        """
-        payload = {
-            "maxexpirytime": maxexpirytime
-        }
-        return self.call("delexpiredinvoice", payload)
-
     def delinvoice(self, label, status, desconly=None):
         """
         Delete unpaid invoice {label} with {status} (or, with {desconly} true, remove its description).

diff --git a/contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py b/contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py
diff --git a/contrib/pyln-grpc-proto/pyln/grpc/node_pb2_grpc.py b/contrib/pyln-grpc-proto/pyln/grpc/node_pb2_grpc.py
@@ -89,11 +89,6 @@ def __init__(self, channel):
                 request_serializer=node__pb2.DeldatastoreRequest.SerializeToString,
                 response_deserializer=node__pb2.DeldatastoreResponse.FromString,
                 )
-        self.DelExpiredInvoice = channel.unary_unary(
-                '/cln.Node/DelExpiredInvoice',
-                request_serializer=node__pb2.DelexpiredinvoiceRequest.SerializeToString,
-                response_deserializer=node__pb2.DelexpiredinvoiceResponse.FromString,
-                )
         self.DelInvoice = channel.unary_unary(
                 '/cln.Node/DelInvoice',
                 request_serializer=node__pb2.DelinvoiceRequest.SerializeToString,
@@ -429,12 +424,6 @@ def DelDatastore(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def DelExpiredInvoice(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
     def DelInvoice(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -801,11 +790,6 @@ def add_NodeServicer_to_server(servicer, server):
                     request_deserializer=node__pb2.DeldatastoreRequest.FromString,
                     response_serializer=node__pb2.DeldatastoreResponse.SerializeToString,
             ),
-            'DelExpiredInvoice': grpc.unary_unary_rpc_method_handler(
-                    servicer.DelExpiredInvoice,
-                    request_deserializer=node__pb2.DelexpiredinvoiceRequest.FromString,
-                    response_serializer=node__pb2.DelexpiredinvoiceResponse.SerializeToString,
-            ),
             'DelInvoice': grpc.unary_unary_rpc_method_handler(
                     servicer.DelInvoice,
                     request_deserializer=node__pb2.DelinvoiceRequest.FromString,
@@ -1311,23 +1295,6 @@ def DelDatastore(request,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
-    @staticmethod
-    def DelExpiredInvoice(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/cln.Node/DelExpiredInvoice',
-            node__pb2.DelexpiredinvoiceRequest.SerializeToString,
-            node__pb2.DelexpiredinvoiceResponse.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
-
     @staticmethod
     def DelInvoice(request,
             target,

diff --git a/contrib/pyln-testing/pyln/testing/grpc2py.py b/contrib/pyln-testing/pyln/testing/grpc2py.py
@@ -389,11 +389,6 @@ def deldatastore2py(m):
     })
 
 
-def delexpiredinvoice2py(m):
-    return remove_default({
-    })
-
-
 def delinvoice2py(m):
     return remove_default({
         "label": m.label,  # PrimitiveField in generate_composite

diff --git a/doc/Makefile b/doc/Makefile
@@ -33,7 +33,6 @@ GENERATE_MARKDOWN := doc/lightning-addgossip.7 \
 	doc/lightning-decode.7 \
 	doc/lightning-decodepay.7 \
 	doc/lightning-deldatastore.7 \
- 	doc/lightning-delexpiredinvoice.7 \
 	doc/lightning-delforward.7 \
 	doc/lightning-delinvoice.7 \
 	doc/lightning-delpay.7 \
@@ -112,7 +111,7 @@ GENERATE_MARKDOWN := doc/lightning-addgossip.7 \
 	doc/lightning-splice_init.7 \
 	doc/lightning-splice_signed.7 \
 	doc/lightning-splice_update.7 \
- 	doc/lightning-staticbackup.7 \
+	doc/lightning-staticbackup.7 \
 	doc/lightning-stop.7 \
 	doc/lightning-txdiscard.7 \
 	doc/lightning-txprepare.7 \

diff --git a/doc/developers-guide/deprecations.md b/doc/developers-guide/deprecations.md
@@ -7,8 +7,6 @@ hidden: false
 
 | Name                                 | Type               | First Deprecated | Last Supported | Description                                                                                                                                                                     |
 |--------------------------------------|--------------------|------------------|----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| delexpiredinvoice                    | Command            | v22.11           | v24.02         | `autoclean-once` is more powerful                                                                                                                                               |
-| autocleaninvoice                     | Command            | v22.11           | v24.02         | `autoclean` is more general, does more than expired invoices                                                                                                                    |
 | autocleaninvoice-cycle               | Config             | v22.11           | v24.02         | Now always once per hour: you can run `autoclean-once` regularly if you need.                                                                                                   |
 | autocleaninvoice-expired-by          | Config             | v22.11           | v24.02         | `autoclean`'s `autoclean-expiredinvoices-age`                                                                                                                                   |
 | feerates.delayed_to_us               | Field              | v23.05           | v24.02         | Not used with anchor outputs.                                                                                                                                                   |

diff --git a/doc/index.rst b/doc/index.rst
@@ -42,7 +42,6 @@ Core Lightning Documentation
    lightning-decode <lightning-decode.7.md>
    lightning-decodepay <lightning-decodepay.7.md>
    lightning-deldatastore <lightning-deldatastore.7.md>
-   lightning-delexpiredinvoice <lightning-delexpiredinvoice.7.md>
    lightning-delforward <lightning-delforward.7.md>
    lightning-delinvoice <lightning-delinvoice.7.md>
    lightning-delpay <lightning-delpay.7.md>