plugins(lsps2): simplify actor and session manager

Merge BlockheightProvider into Lsps2PolicyProvider, extract
check_cltv_timeout helper in the session FSM, flatten recovery
branching in SessionManager, simplify the actor loop with
convert_input and tokio::select!, and remove the unused
CollectTimeout ActorInput variant.

Author: nepet

plugins/lsps-plugin/src/cln_adapters/mod.rs

@@ -5,6 +5,6 @@ pub mod state;
 pub mod types;
 
 pub use rpc::{
-    ClnActionExecutor, ClnBlockheight, ClnDatastore, ClnPolicyProvider, ClnRecoveryProvider,
+    ClnActionExecutor, ClnDatastore, ClnPolicyProvider, ClnRecoveryProvider,
     ClnRpcClient,
 };

plugins/lsps-plugin/src/cln_adapters/rpc.rs

@@ -2,7 +2,7 @@ use crate::{
     core::lsps2::{
         actor::ActionExecutor,
         provider::{
-            Blockheight, BlockheightProvider, ChannelRecoveryInfo, DatastoreProvider,
+            ChannelRecoveryInfo, DatastoreProvider,
             ForwardActivity, Lsps2PolicyProvider, RecoveryProvider,
         },
     },
@@ -661,23 +661,23 @@ impl DatastoreProvider for ClnDatastore {
 }
 
 // ---------------------------------------------------------------------------
-// ClnBlockheight — implements BlockheightProvider
+// ClnPolicyProvider — implements Lsps2PolicyProvider
 // ---------------------------------------------------------------------------
 
 #[derive(Clone)]
-pub struct ClnBlockheight {
+pub struct ClnPolicyProvider {
     rpc: ClnRpcClient,
 }
 
-impl ClnBlockheight {
+impl ClnPolicyProvider {
     pub fn new(rpc: ClnRpcClient) -> Self {
         Self { rpc }
     }
 }
 
 #[async_trait]
-impl BlockheightProvider for ClnBlockheight {
-    async fn get_blockheight(&self) -> Result<Blockheight> {
+impl Lsps2PolicyProvider for ClnPolicyProvider {
+    async fn get_blockheight(&self) -> Result<u32> {
         let mut rpc = self.rpc.create_rpc().await?;
         let info = rpc
             .call_typed(&GetinfoRequest {})
@@ -686,25 +686,7 @@ impl BlockheightProvider for ClnBlockheight {
             .with_context(|| "calling getinfo")?;
         Ok(info.blockheight)
     }
-}
-
-// ---------------------------------------------------------------------------
-// ClnPolicyProvider — implements Lsps2PolicyProvider
-// ---------------------------------------------------------------------------
-
-#[derive(Clone)]
-pub struct ClnPolicyProvider {
-    rpc: ClnRpcClient,
-}
-
-impl ClnPolicyProvider {
-    pub fn new(rpc: ClnRpcClient) -> Self {
-        Self { rpc }
-    }
-}
 
-#[async_trait]
-impl Lsps2PolicyProvider for ClnPolicyProvider {
     async fn get_info(
         &self,
         request: &Lsps2PolicyGetInfoRequest,