diff --git a/plugins/lsps-plugin/src/client.rs b/plugins/lsps-plugin/src/client.rs index a466560f7..88189c642 100644 --- a/plugins/lsps-plugin/src/client.rs +++ b/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; diff --git a/plugins/lsps-plugin/src/lib.rs b/plugins/lsps-plugin/src/lib.rs index f14b96c7d..d4ef4ae7b 100644 --- a/plugins/lsps-plugin/src/lib.rs +++ b/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; diff --git a/plugins/lsps-plugin/src/lsps0/mod.rs b/plugins/lsps-plugin/src/lsps0/mod.rs index f32b0a558..d4959a323 100644 --- a/plugins/lsps-plugin/src/lsps0/mod.rs +++ b/plugins/lsps-plugin/src/lsps0/mod.rs @@ -1,4 +1,3 @@ pub mod handler; pub mod model; -pub mod primitives; pub mod transport; diff --git a/plugins/lsps-plugin/src/lsps2/handler.rs b/plugins/lsps-plugin/src/lsps2/handler.rs index 4e86943f6..1eb323fe8 100644 --- a/plugins/lsps-plugin/src/lsps2/handler.rs +++ b/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}; diff --git a/plugins/lsps-plugin/src/lsps2/model.rs b/plugins/lsps-plugin/src/lsps2/model.rs index bcf8de079..c9767dee9 100644 --- a/plugins/lsps-plugin/src/lsps2/model.rs +++ b/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; diff --git a/plugins/lsps-plugin/src/proto/mod.rs b/plugins/lsps-plugin/src/proto/mod.rs new file mode 100644 index 000000000..23cd13c5a --- /dev/null +++ b/plugins/lsps-plugin/src/proto/mod.rs @@ -0,0 +1 @@ +pub mod primitives; diff --git a/plugins/lsps-plugin/src/lsps0/primitives.rs b/plugins/lsps-plugin/src/proto/primitives.rs similarity index 100% rename from plugins/lsps-plugin/src/lsps0/primitives.rs rename to plugins/lsps-plugin/src/proto/primitives.rs