msggen: add dev-forget-channel method

Changelog-None
ElementsProject · May 16, 2024 · b8a6512 · b8a6512
1 parent 934b85a
commit b8a6512
Show file tree

Hide file tree

Showing 9 changed files with 797 additions and 577 deletions.
diff --git a/.msggen.json b/.msggen.json
@@ -1053,6 +1053,17 @@
         "DelpayResponse": {
             "DelPay.payments[]": 1
         },
+        "Dev-forget-channelRequest": {
+            "Dev-Forget-Channel.channel_id": 3,
+            "Dev-Forget-Channel.force": 4,
+            "Dev-Forget-Channel.id": 1,
+            "Dev-Forget-Channel.short_channel_id": 2
+        },
+        "Dev-forget-channelResponse": {
+            "Dev-Forget-Channel.forced": 1,
+            "Dev-Forget-Channel.funding_txid": 3,
+            "Dev-Forget-Channel.funding_unspent": 2
+        },
         "DisableofferRequest": {
             "DisableOffer.offer_id": 1
         },
@@ -4400,6 +4411,38 @@
             "added": "pre-v0.10.1",
             "deprecated": false
         },
+        "Dev-Forget-Channel": {
+            "added": "pre-v0.10.1",
+            "deprecated": null
+        },
+        "Dev-Forget-Channel.channel_id": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "Dev-Forget-Channel.force": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "Dev-Forget-Channel.forced": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "Dev-Forget-Channel.funding_txid": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "Dev-Forget-Channel.funding_unspent": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "Dev-Forget-Channel.id": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "Dev-Forget-Channel.short_channel_id": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
         "DisableOffer": {
             "added": "pre-v0.10.1",
             "deprecated": null

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
@@ -658,6 +658,38 @@ impl Node for Server
 
     }
 
+    async fn dev_forget_channel(
+        &self,
+        request: tonic::Request<pb::DevforgetchannelRequest>,
+    ) -> Result<tonic::Response<pb::DevforgetchannelResponse>, tonic::Status> {
+        let req = request.into_inner();
+        let req: requests::DevforgetchannelRequest = req.into();
+        debug!("Client asked for dev_forget_channel");
+        trace!("dev_forget_channel 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::DevForgetChannel(req))
+            .await
+            .map_err(|e| Status::new(
+               Code::Unknown,
+               format!("Error calling method DevForgetChannel: {:?}", e)))?;
+        match result {
+            Response::DevForgetChannel(r) => {
+               trace!("dev_forget_channel response: {:?}", r);
+               Ok(tonic::Response::new(r.into()))
+            },
+            r => Err(Status::new(
+                Code::Internal,
+                format!(
+                    "Unexpected result {:?} to method call DevForgetChannel",
+                    r
+                )
+            )),
+        }
+
+    }
+
     async fn invoice(
         &self,
         request: tonic::Request<pb::InvoiceRequest>,

diff --git a/cln-rpc/src/model.rs b/cln-rpc/src/model.rs
diff --git a/contrib/msggen/msggen/utils/utils.py b/contrib/msggen/msggen/utils/utils.py
@@ -108,6 +108,7 @@ def load_jsonrpc_service():
         "CreateOnion",
         "DelDatastore",
         "DelInvoice",
+        "Dev-Forget-Channel",
         "Invoice",
         "ListDatastore",
         "ListInvoices",

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
@@ -104,6 +104,11 @@ def __init__(self, channel):
                 request_serializer=node__pb2.DelinvoiceRequest.SerializeToString,
                 response_deserializer=node__pb2.DelinvoiceResponse.FromString,
                 )
+        self.DevForgetChannel = channel.unary_unary(
+                '/cln.Node/DevForgetChannel',
+                request_serializer=node__pb2.DevforgetchannelRequest.SerializeToString,
+                response_deserializer=node__pb2.DevforgetchannelResponse.FromString,
+                )
         self.Invoice = channel.unary_unary(
                 '/cln.Node/Invoice',
                 request_serializer=node__pb2.InvoiceRequest.SerializeToString,
@@ -632,6 +637,12 @@ def DelInvoice(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def DevForgetChannel(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 Invoice(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -1223,6 +1234,11 @@ def add_NodeServicer_to_server(servicer, server):
                     request_deserializer=node__pb2.DelinvoiceRequest.FromString,
                     response_serializer=node__pb2.DelinvoiceResponse.SerializeToString,
             ),
+            'DevForgetChannel': grpc.unary_unary_rpc_method_handler(
+                    servicer.DevForgetChannel,
+                    request_deserializer=node__pb2.DevforgetchannelRequest.FromString,
+                    response_serializer=node__pb2.DevforgetchannelResponse.SerializeToString,
+            ),
             'Invoice': grpc.unary_unary_rpc_method_handler(
                     servicer.Invoice,
                     request_deserializer=node__pb2.InvoiceRequest.FromString,
@@ -1954,6 +1970,23 @@ def DelInvoice(request,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
+    @staticmethod
+    def DevForgetChannel(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/DevForgetChannel',
+            node__pb2.DevforgetchannelRequest.SerializeToString,
+            node__pb2.DevforgetchannelResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
     @staticmethod
     def Invoice(request,
             target,

diff --git a/contrib/pyln-testing/pyln/testing/grpc2py.py b/contrib/pyln-testing/pyln/testing/grpc2py.py
@@ -421,6 +421,14 @@ def delinvoice2py(m):
     })
 
 
+def dev_forget_channel2py(m):
+    return remove_default({
+        "forced": m.forced,  # PrimitiveField in generate_composite
+        "funding_txid": hexlify(m.funding_txid),  # PrimitiveField in generate_composite
+        "funding_unspent": m.funding_unspent,  # PrimitiveField in generate_composite
+    })
+
+
 def invoice2py(m):
     return remove_default({
         "bolt11": m.bolt11,  # PrimitiveField in generate_composite