fix: adapt reconnect branch to upstream pubkey helpers

Author: jjyr

crates/fiber-lib/src/fiber/network.rs

@@ -1145,7 +1145,7 @@ where
                 }
             }
             NetworkActorCommand::DisconnectPeer(pubkey, reason) => {
-                let peer_id = PeerId::from_public_key(&tentacle::secio::PublicKey::from(pubkey));
+                let peer_id = PeerId::from_public_key(&super::types::pubkey_to_tentacle(pubkey));
                 let session = state
                     .peer_session_map
                     .get(&pubkey)
@@ -3732,7 +3732,7 @@ where
                 .get_channel_states(None)
                 .into_iter()
                 .find_map(|(pubkey, _, _)| {
-                    let id = PeerId::from_public_key(&tentacle::secio::PublicKey::from(pubkey));
+                    let id = PeerId::from_public_key(&super::types::pubkey_to_tentacle(pubkey));
                     (id == *peer_id).then_some(pubkey)
                 })
         })
@@ -4106,7 +4106,7 @@ where
             self.to_be_accepted_channels.remove(&channel_id);
         }
 
-        let peer_id = PeerId::from_public_key(&tentacle::secio::PublicKey::from(pubkey));
+        let peer_id = PeerId::from_public_key(&super::types::pubkey_to_tentacle(pubkey));
         if self.requested_disconnect_peers.remove(&peer_id) {
             debug_event!(self.network, "PeerReconnectBackoffSkippedRequested");
             return;

crates/fiber-lib/src/fiber/tests/channel.rs

@@ -10,7 +10,7 @@ use crate::fiber::config::{
 
 use crate::fiber::graph::ChannelInfo;
 use crate::fiber::network::{DebugEvent, FiberMessageWithTarget, PeerDisconnectReason};
-use crate::fiber::payment::{AttemptStatus, SendPaymentCommand};
+use crate::fiber::payment::SendPaymentCommand;
 use crate::fiber::types::{
     AddTlc, FiberMessage, Hash256, Init, PeeledPaymentOnionPacket, Pubkey, TlcErr,
 };
@@ -26,7 +26,6 @@ use crate::{
         },
         config::DEFAULT_AUTO_ACCEPT_CHANNEL_CKB_FUNDING_AMOUNT,
         network::{AcceptChannelCommand, OpenChannelCommand},
-        types::{Privkey, RemoveTlcFulfill, RemoveTlcReason},
         NetworkActorCommand, NetworkActorMessage,
     },
     gen_rand_fiber_private_key, gen_rand_fiber_public_key, gen_rand_sha256_hash,
@@ -39,9 +38,10 @@ use ckb_types::{
     prelude::{AsTransactionBuilder, Builder, Entity, Pack, Unpack},
 };
 use fiber_types::{
-    derive_private_key, derive_tlc_pubkey, AddTlcCommand, ChannelState, HashAlgorithm,
-    InMemorySigner, NegotiatingFundingFlags, OutboundTlcStatus, PaymentHopData, PaymentStatus,
-    Privkey, RemoveTlcFulfill, RemoveTlcReason, TLCId, TlcErrorCode, TlcStatus, NO_SHARED_SECRET,
+    derive_private_key, derive_tlc_pubkey, AddTlcCommand, AttemptStatus, ChannelState,
+    HashAlgorithm, InMemorySigner, NegotiatingFundingFlags, OutboundTlcStatus, PaymentHopData,
+    PaymentStatus, Privkey, RemoveTlcFulfill, RemoveTlcReason, TLCId, TlcErrorCode, TlcStatus,
+    NO_SHARED_SECRET,
 };
 use fiber_types::{CloseFlags, FeatureVector};
 use musig2::secp::Point;