plugins: lsps: move primitives into proto module

This commit is part of a series that refactor the lsp plugin crate into
a modularized crate with the goal to separate the actual plugin runtime
as much as possible from library code to make it accessible for 3rd
party plugin implementations.

Signed-off-by: Peter Neuroth <pet.v.ne@gmail.com>

plugins/lsps-plugin/src/client.rs

@@ -16,6 +16,7 @@ use cln_lsps::lsps2::model::{
     compute_opening_fee, Lsps2BuyRequest, Lsps2BuyResponse, Lsps2GetInfoRequest,
     Lsps2GetInfoResponse, OpeningFeeParams,
 };
+use cln_lsps::proto::primitives::Msat;
 use cln_lsps::util;
 use cln_lsps::LSP_FEATURE_BIT;
 use cln_plugin::options;

plugins/lsps-plugin/src/lib.rs

@@ -1,6 +1,7 @@
 pub mod jsonrpc;
 pub mod lsps0;
 pub mod lsps2;
+pub mod proto;
 pub mod util;
 
 pub const LSP_FEATURE_BIT: usize = 729;

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

@@ -1,4 +1,3 @@
 pub mod handler;
 pub mod model;
-pub mod primitives;
 pub mod transport;

plugins/lsps-plugin/src/lsps2/handler.rs

@@ -1,6 +1,5 @@
 use crate::{
     jsonrpc::{server::RequestHandler, JsonRpcResponse as _, RequestObject, RpcError},
-    lsps0::primitives::{Msat, ShortChannelId},
     lsps2::{
         cln::{HtlcAcceptedRequest, HtlcAcceptedResponse, TLV_FORWARD_AMT},
         model::{
@@ -13,6 +12,7 @@ use crate::{
         },
         DS_MAIN_KEY, DS_SUB_KEY,
     },
+    proto::primitives::{Msat, ShortChannelId},
     util::unwrap_payload_with_peer_id,
 };
 use anyhow::{Context, Result as AnyResult};
@@ -679,11 +679,11 @@ mod tests {
     use super::*;
     use crate::{
         jsonrpc::{JsonRpcRequest, ResponseObject},
-        lsps0::primitives::{Msat, Ppm},
         lsps2::{
             cln::{tlv::TlvStream, HtlcAcceptedResult},
             model::PolicyOpeningFeeParams,
         },
+        proto::primitives::Ppm,
         util::wrap_payload_with_peer_id,
     };
     use chrono::{TimeZone, Utc};

plugins/lsps-plugin/src/lsps2/model.rs

@@ -1,6 +1,6 @@
 use crate::{
     jsonrpc::{JsonRpcRequest, RpcError},
-    lsps0::primitives::{DateTime, Msat, Ppm, ShortChannelId},
+    proto::primitives::{DateTime, Msat, Ppm, ShortChannelId},
 };
 use bitcoin::hashes::{sha256, Hash, HashEngine, Hmac, HmacEngine};
 use chrono::Utc;

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

@@ -0,0 +1 @@
+pub mod primitives;