Merge pull request #48 from tnull/2023-11-crate-restructuring

Restructure crate

Author: tnull

.github/workflows/build.yml

@@ -47,3 +47,5 @@ jobs:
         run: rustup component add rustfmt && cargo fmt --all -- --check
       - name: Test on Rust ${{ matrix.toolchain }}
         run: cargo test
+      - name: Test on Rust ${{ matrix.toolchain }} with LSPS1 support
+        run: RUSTFLAGS="--cfg lsps1" cargo test

src/events.rs

@@ -14,9 +14,10 @@
 //! [`LiquidityManager::get_and_clear_pending_events`] to receive events.
 //!
 //! [`LiquidityManager::get_and_clear_pending_events`]: crate::LiquidityManager::get_and_clear_pending_events
-/// [`crate::LiquidityManager::get_and_clear_pending_events()`] to receive events.
-use crate::channel_request;
-use crate::jit_channel;
+
+#[cfg(lsps1)]
+use crate::lsps1;
+use crate::lsps2;
 use std::collections::VecDeque;
 use std::sync::{Condvar, Mutex};
 
@@ -61,7 +62,8 @@ impl EventQueue {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Event {
 	/// An LSPS2 (JIT Channel) protocol event.
-	LSPS2(jit_channel::LSPS2Event),
+	LSPS2(lsps2::LSPS2Event),
 	/// An LSPS1 protocol event.
-	LSPS1(channel_request::event::Event),
+	#[cfg(lsps1)]
+	LSPS1(lsps1::event::Event),
 }

src/lib.rs

@@ -18,14 +18,11 @@
 #![allow(clippy::drop_non_drop)]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 
-mod channel_request;
 pub mod events;
-pub mod jit_channel;
-mod transport;
+mod lsps0;
+#[cfg(lsps1)]
+mod lsps1;
+pub mod lsps2;
 mod utils;
 
-pub use channel_request::event::Event as LSPS1Event;
-pub use transport::message_handler::{
-	JITChannelsConfig, LiquidityManager, LiquidityProviderConfig,
-};
-pub use transport::msgs::{RawLSPSMessage, LSPS_MESSAGE_TYPE_ID};
+pub use lsps0::message_handler::{JITChannelsConfig, LiquidityManager, LiquidityProviderConfig};