refactor: move cch order related code to a module

Author: doitian

crates/fiber-lib/src/cch/actor.rs

@@ -25,7 +25,7 @@ use crate::invoice::{CkbInvoice, Currency, InvoiceBuilder};
 use crate::time::{Duration, SystemTime, UNIX_EPOCH};
 
 use super::{
-    error::CchDbError, CchConfig, CchError, CchIncomingEvent, CchIncomingPaymentStatus, CchInvoice,
+    CchConfig, CchDbError, CchError, CchIncomingEvent, CchIncomingPaymentStatus, CchInvoice,
     CchOrder, CchOrderStatus, CchOrdersDb, CchOutgoingPaymentStatus, LndConnectionInfo,
     LndTrackerActor, LndTrackerArgs, LndTrackerMessage,
 };

crates/fiber-lib/src/cch/error.rs

@@ -3,19 +3,10 @@ use crate::time::SystemTimeError;
 use jsonrpsee::types::{error::CALL_EXECUTION_FAILED_CODE, ErrorObjectOwned};
 use thiserror::Error;
 
-#[derive(Error, Debug)]
-pub enum CchDbError {
-    #[error("Inserting duplicated key: {0}")]
-    Duplicated(String),
-
-    #[error("Key not found: {0}")]
-    NotFound(String),
-}
-
 #[derive(Error, Debug)]
 pub enum CchError {
     #[error("Database error: {0}")]
-    DbError(#[from] CchDbError),
+    DbError(#[from] super::order::CchDbError),
     #[error("BTC invoice parse error: {0}")]
     BTCInvoiceParseError(#[from] lightning_invoice::ParseOrSemanticError),
     #[error("BTC invoice expired")]

crates/fiber-lib/src/cch/mod.rs

@@ -18,10 +18,7 @@ pub use config::{
 };
 
 mod order;
-pub use order::{CchInvoice, CchOrder, CchOrderStatus};
-
-mod orders_db;
-pub use orders_db::CchOrdersDb;
+pub use order::{CchDbError, CchInvoice, CchOrder, CchOrderStatus, CchOrdersDb};
 
 #[cfg(test)]
 pub mod tests;

crates/fiber-lib/src/cch/orders_db.rs crates/fiber-lib/src/cch/order/db.rscrates/fiber-lib/src/cch/orders_db.rs renamed to crates/fiber-lib/src/cch/order/db.rs

@@ -1,8 +1,18 @@
 use std::collections::HashMap;
+use thiserror::Error;
 
 use crate::fiber::types::Hash256;
 
-use super::{error::CchDbError, CchOrder};
+use super::CchOrder;
+
+#[derive(Error, Debug)]
+pub enum CchDbError {
+    #[error("Inserting duplicated key: {0}")]
+    Duplicated(String),
+
+    #[error("Key not found: {0}")]
+    NotFound(String),
+}
 
 // TODO: persist orders
 #[derive(Default)]

crates/fiber-lib/src/cch/order.rs crates/fiber-lib/src/cch/order/mod.rscrates/fiber-lib/src/cch/order.rs renamed to crates/fiber-lib/src/cch/order/mod.rs

@@ -1,3 +1,6 @@
+mod db;
+pub use db::{CchDbError, CchOrdersDb};
+
 use lightning_invoice::Bolt11Invoice;
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, DisplayFromStr};