fix fiber-type import issues

Author: chenyukang

crates/fiber-lib/Cargo.toml

@@ -150,6 +150,7 @@ mutable-key-type = "allow"
 needless-return = "allow"
 upper-case-acronyms = "allow"
 result_large_err = "allow"
+new_ret_no_self = "allow"
 
 [package.metadata.cargo-shear]
 ignored = ["getrandom"]

crates/fiber-lib/benches/payment_benchmarks.rs

@@ -2,10 +2,10 @@
 use ckb_types::packed::OutPoint;
 use ckb_types::prelude::Entity;
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
+use fiber_types::{FeatureVector, HopHint};
 use fnn::fiber::config::{
     DEFAULT_FINAL_TLC_EXPIRY_DELTA, DEFAULT_TLC_EXPIRY_DELTA, MAX_PAYMENT_TLC_EXPIRY_LIMIT,
 };
-use fnn::fiber::features::FeatureVector;
 use fnn::fiber::gossip::GossipMessageStore;
 use fnn::fiber::graph::{GraphChannelStat, NetworkGraph};
 use fnn::fiber::network::get_chain_hash;
@@ -320,7 +320,7 @@ fn bench_find_path_single_call_large_graph(c: &mut Criterion) {
     let target: Pubkey = keys[199].into();
 
     let channel_stats = GraphChannelStat::default();
-    let hop_hints: Vec<fnn::fiber::payment::HopHint> = Vec::new();
+    let hop_hints: Vec<HopHint> = Vec::new();
     let amount = 500;
 
     let mut group = c.benchmark_group("find_path_single_call_large_graph");

crates/fiber-lib/src/cch/actions/backend_dispatchers.rs

@@ -1,4 +1,4 @@
-use crate::cch::{CchInvoice, CchOrder};
+use fiber_types::{CchInvoice, CchOrder};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum PaymentHandlerType {

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

@@ -3,6 +3,7 @@ pub(crate) mod send_outgoing_payment;
 pub(crate) mod settle_incoming_invoice;
 pub(crate) mod track_incoming_invoice;
 mod track_outgoing_payment;
+use fiber_types::{CchOrder, CchOrderStatus};
 use send_outgoing_payment::SendOutgoingPaymentDispatcher;
 use settle_incoming_invoice::SettleIncomingInvoiceDispatcher;
 use track_incoming_invoice::TrackIncomingInvoiceDispatcher;
@@ -11,7 +12,7 @@ use track_outgoing_payment::TrackOutgoingPaymentDispatcher;
 use anyhow::Result;
 use ractor::ActorRef;
 
-use crate::cch::{actor::CchState, CchMessage, CchOrder, CchOrderStatus, CchOrderStore};
+use crate::cch::{actor::CchState, CchMessage, CchOrderStore};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum CchOrderAction {

crates/fiber-lib/src/cch/actions/send_outgoing_payment.rs

@@ -11,14 +11,12 @@ use crate::{
         },
         actor::CchState,
         trackers::{map_lnd_payment_changed_event, CchTrackingEvent, LndConnectionInfo},
-        CchMessage, CchOrder, CchOrderStatus, CchOrderStore,
-    },
-    fiber::{
-        payment::{PaymentStatus, SendPaymentCommand},
-        types::Hash256,
-        NetworkActorCommand, NetworkActorMessage,
+        CchMessage, CchOrderStore,
     },
+    fiber::{payment::SendPaymentCommand, NetworkActorCommand, NetworkActorMessage},
 };
+use fiber_types::{payment::PaymentStatus, CchOrder};
+use fiber_types::{CchOrderStatus, Hash256};
 
 const BTC_PAYMENT_TIMEOUT_SECONDS: i32 = 60;
 

crates/fiber-lib/src/cch/actions/settle_incoming_invoice.rs

@@ -10,11 +10,12 @@ use crate::{
         },
         actor::CchState,
         trackers::{CchTrackingEvent, LndConnectionInfo},
-        CchMessage, CchOrder, CchOrderStatus, CchOrderStore,
+        CchMessage, CchOrderStore,
     },
-    fiber::{types::Hash256, NetworkActorCommand, NetworkActorMessage, ASSUME_NETWORK_ACTOR_ALIVE},
+    fiber::{NetworkActorCommand, NetworkActorMessage, ASSUME_NETWORK_ACTOR_ALIVE},
     invoice::{CkbInvoiceStatus, SettleInvoiceError},
 };
+use fiber_types::{CchOrder, CchOrderStatus, Hash256};
 
 pub struct SettleIncomingInvoiceDispatcher;
 

crates/fiber-lib/src/cch/actions/track_incoming_invoice.rs

@@ -1,18 +1,16 @@
 use ractor::ActorRef;
 
-use crate::{
-    cch::{
-        actions::{
-            backend_dispatchers::{dispatch_invoice_handler, InvoiceHandlerType},
-            ActionExecutor,
-        },
-        actor::CchState,
-        trackers::LndTrackerMessage,
-        CchMessage, CchOrder, CchOrderStore,
+use crate::cch::{
+    actions::{
+        backend_dispatchers::{dispatch_invoice_handler, InvoiceHandlerType},
+        ActionExecutor,
     },
-    fiber::types::Hash256,
+    actor::CchState,
+    trackers::LndTrackerMessage,
+    CchMessage, CchOrderStore,
 };
 use anyhow::Result;
+use fiber_types::{CchOrder, Hash256};
 
 pub struct TrackIncomingInvoiceDispatcher;
 

crates/fiber-lib/src/cch/actions/track_outgoing_payment.rs

@@ -1,6 +1,7 @@
+use fiber_types::CchOrder;
 use ractor::ActorRef;
 
-use crate::cch::{actions::ActionExecutor, actor::CchState, CchMessage, CchOrder, CchOrderStore};
+use crate::cch::{actions::ActionExecutor, actor::CchState, CchMessage, CchOrderStore};
 
 pub struct TrackOutgoingPaymentDispatcher;
 

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

@@ -18,16 +18,14 @@ use crate::cch::scheduler::{CchOrderSchedulerActor, SchedulerArgs, SchedulerMess
 use crate::cch::trackers::{
     CchTrackingEvent, LndConnectionInfo, LndTrackerActor, LndTrackerArgs, LndTrackerMessage,
 };
-use crate::cch::{
-    CchConfig, CchError, CchInvoice, CchOrder, CchOrderStatus, CchOrderStore, CchStoreError,
-};
+use crate::cch::{CchConfig, CchError, CchOrderStore, CchStoreError};
 use crate::ckb::contracts::{get_script_by_contract, Contract};
-use crate::fiber::hash_algorithm::HashAlgorithm;
-use crate::fiber::types::{Hash256, Privkey};
 use crate::fiber::ASSUME_NETWORK_ACTOR_ALIVE;
 use crate::fiber::{NetworkActorCommand, NetworkActorMessage};
 use crate::invoice::{CkbInvoice, Currency, InvoiceBuilder};
 use crate::time::{Duration, SystemTime, UNIX_EPOCH};
+use fiber_types::{CchInvoice, CchOrder, CchOrderStatus, HashAlgorithm};
+use fiber_types::{Hash256, Privkey};
 
 pub const ACTION_RETRY_BASE_MILLIS: u64 = 1000; // 1 second initial delay
 pub const ACTION_RETRY_MAX_MILLIS: u64 = 600_000; // 10 minute max delay

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

@@ -1,5 +1,5 @@
-use crate::{cch::CchOrderStatus, fiber::types::Hash256, time::SystemTimeError};
-
+use crate::time::SystemTimeError;
+use fiber_types::{CchOrderStatus, Hash256};
 use jsonrpsee::types::{error::CALL_EXECUTION_FAILED_CODE, ErrorObjectOwned};
 use thiserror::Error;