diff --git a/plugins/lsps-plugin/src/client.rs b/plugins/lsps-plugin/src/client.rs index d631dd0298ac..36614951dabb 100644 --- a/plugins/lsps-plugin/src/client.rs +++ b/plugins/lsps-plugin/src/client.rs @@ -50,6 +50,7 @@ const DEFAULT_REQUEST_TIMEOUT: std::time::Duration = std::time::Duration::from_s #[derive(Clone)] pub struct State { + rpc_path: PathBuf, sender: ClnSender, pending: PendingRequests, timeout: std::time::Duration, @@ -58,12 +59,20 @@ pub struct State { impl State { pub fn new(rpc_path: PathBuf, timeout: std::time::Duration) -> Self { Self { - sender: ClnSender::new(rpc_path), + sender: ClnSender::new(rpc_path.clone()), + rpc_path, pending: PendingRequests::new(), timeout, } } + /// Connects to core-lightning's RPC. + pub async fn rpc(&self) -> Result { + ClnRpc::new(&self.rpc_path) + .await + .context("failed to connect to core-lightning") + } + pub fn client(&self) -> LspsClient> { LspsClient::new(self.transport()) } @@ -149,9 +158,7 @@ async fn on_lsps_lsps2_getinfo( let lsp_id = PublicKey::from_str(&req.lsp_id).context("lsp_id is not a valid public key")?; - let dir = p.configuration().lightning_dir; - let rpc_path = Path::new(&dir).join(&p.configuration().rpc_file); - let mut cln_client = cln_rpc::ClnRpc::new(rpc_path.clone()).await?; + let mut cln_client = p.state().rpc().await?; let lsp_status = check_peer_lsp_status(&mut cln_client, &req.lsp_id).await?; @@ -189,9 +196,7 @@ async fn on_lsps_lsps2_buy( let lsp_id = PublicKey::from_str(&req.lsp_id).context("lsp_id is not a valid public key")?; - let dir = p.configuration().lightning_dir; - let rpc_path = Path::new(&dir).join(&p.configuration().rpc_file); - let mut cln_client = cln_rpc::ClnRpc::new(rpc_path.clone()).await?; + let mut cln_client = p.state().rpc().await?; let lsp_status = check_peer_lsp_status(&mut cln_client, &req.lsp_id).await?; @@ -274,9 +279,7 @@ async fn on_lsps_lsps2_approve( }; let ds_rec_json = serde_json::to_string(&ds_rec)?; - let dir = p.configuration().lightning_dir; - let rpc_path = Path::new(&dir).join(&p.configuration().rpc_file); - let mut cln_client = cln_rpc::ClnRpc::new(rpc_path.clone()).await?; + let mut cln_client = p.state().rpc().await?; let ds_req = DatastoreRequest { generation: None, @@ -346,9 +349,7 @@ async fn on_lsps_lsps2_invoice( req.lsp_id, req.amount_msat, req.token ); - let dir = p.configuration().lightning_dir; - let rpc_path = Path::new(&dir).join(&p.configuration().rpc_file); - let mut cln_client = cln_rpc::ClnRpc::new(rpc_path.clone()).await?; + let mut cln_client = p.state().rpc().await?; // 1. Get LSP's opening fee menu. let info_res: Lsps2GetInfoResponse = cln_client @@ -532,13 +533,7 @@ async fn on_invoice_payment( let hash = payment_hash(&preimage); // Delete DS-entries. - let dir = p.configuration().lightning_dir; - let rpc_path = Path::new(&dir).join(&p.configuration().rpc_file); - let mut cln_client = ok_or_continue!( - cln_rpc::ClnRpc::new(rpc_path.clone()) - .await - .context("failed to connect to core-lightning") - ); + let mut cln_client = ok_or_continue!(p.state().rpc().await); ok_or_continue!( cln_client .call_typed(&DeldatastoreRequest { @@ -572,13 +567,7 @@ async fn on_htlc_accepted( ); // Check that the htlc belongs to a jit-channel request. - let dir = p.configuration().lightning_dir; - let rpc_path = Path::new(&dir).join(&p.configuration().rpc_file); - let mut cln_client = ok_or_continue!( - cln_rpc::ClnRpc::new(rpc_path.clone()) - .await - .context("failed to connect to core-lightning") - ); + let mut cln_client = ok_or_continue!(p.state().rpc().await); let lsp_data = ok_or_continue!( cln_client @@ -681,13 +670,7 @@ async fn on_openchannel( // Fixme: Check that channel parameters are as negotiated. - let dir = p.configuration().lightning_dir; - let rpc_path = Path::new(&dir).join(&p.configuration().rpc_file); - let mut cln_client = ok_or_continue!( - cln_rpc::ClnRpc::new(rpc_path.clone()) - .await - .context("failed to connect to core-lightning") - ); + let mut cln_client = ok_or_continue!(p.state().rpc().await); let ds_req = ListdatastoreRequest { key: Some(vec![ @@ -741,9 +724,7 @@ async fn on_lsps_listprotocols( struct Request { lsp_id: String, } - let dir = p.configuration().lightning_dir; - let rpc_path = Path::new(&dir).join(&p.configuration().rpc_file); - let mut cln_client = cln_rpc::ClnRpc::new(rpc_path.clone()).await?; + let mut cln_client = p.state().rpc().await?; let req: Request = serde_json::from_value(v).context("Failed to parse request JSON")?; let lsp_id = PublicKey::from_str(&req.lsp_id).context("lsp_id is not a valid public key")?;