Resolve moved lnp-core deps

farcaster-project · Feb 21, 2022 · 888949d · 888949d
1 parent b18378c
commit 888949d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 19 deletions.
diff --git a/src/farcasterd/runtime.rs b/src/farcasterd/runtime.rs
@@ -55,7 +55,6 @@ use internet2::{
     addr::InetSocketAddr, NodeAddr, RemoteNodeAddr, RemoteSocketAddr, ToNodeAddr, TypedEnum,
     UrlString,
 };
-use lnp::{message, Messages, TempChannelId as TempSwapId, LIGHTNING_P2P_DEFAULT_PORT};
 use lnpbp::chain::Chain;
 use microservices::esb::{self, Handler};
 use microservices::rpc::Failure;
@@ -968,7 +967,7 @@ impl Runtime {
                         remote_addr: RemoteSocketAddr::Ftcp(peer_address), /* expected RemoteSocketAddr */
                     };
                     let peer = daemon_service
-                        .to_node_addr(LIGHTNING_P2P_DEFAULT_PORT)
+                        .to_node_addr(internet2::LIGHTNING_P2P_DEFAULT_PORT)
                         .ok_or(internet2::presentation::Error::InvalidEndpoint)?;
 
                     // Connect

diff --git a/src/peerd/runtime.rs b/src/peerd/runtime.rs
@@ -18,11 +18,11 @@ use std::{collections::HashMap, sync::Arc};
 use std::{rc::Rc, thread::spawn};
 
 use amplify::Bipolar;
-use bitcoin::secp256k1::rand::{self, Rng};
+use bitcoin::secp256k1::rand::{self, Rng, RngCore};
 use bitcoin::secp256k1::PublicKey;
 use internet2::{addr::InetSocketAddr, CreateUnmarshaller, Unmarshall, Unmarshaller};
 use internet2::{presentation, transport, zmqsocket, NodeAddr, TypedEnum, ZmqType, ZMQ_CONTEXT};
-use lnp::{message, Message};
+use lnp::p2p::legacy::{Messages, Ping};
 use microservices::esb::{self, Handler};
 use microservices::node::TryService;
 use microservices::peer::{self, PeerConnection, PeerSender, SendMessage};
@@ -377,11 +377,7 @@ impl Runtime {
         }
 
         match &request {
-            Request::Protocol(Msg::PingPeer) => self.ping()?,
-
-            Request::Protocol(Msg::Ping(message::Ping { pong_size, .. })) => {
-                self.pong(*pong_size)?
-            }
+            Request::Protocol(Msg::Ping(Ping { pong_size, .. })) => self.pong(*pong_size)?,
 
             Request::Protocol(Msg::Pong(noise)) => {
                 match self.awaited_pong {
@@ -498,11 +494,12 @@ impl Runtime {
         }
         let mut rng = rand::thread_rng();
         let len: u16 = rng.gen_range(4, 32);
-        let noise = vec![0u8; len as usize].iter().map(|_| rng.gen()).collect();
+        let mut noise = vec![0u8; len as usize];
+        rng.fill_bytes(&mut noise);
         let pong_size = rng.gen_range(4, 32);
         self.messages_sent += 1;
-        self.sender.send_message(Msg::Ping(message::Ping {
-            ignored: noise,
+        self.sender.send_message(Msg::Ping(Ping {
+            ignored: noise.into(),
             pong_size,
         }))?;
         self.awaited_pong = Some(pong_size);

diff --git a/src/rpc/messages.rs b/src/rpc/messages.rs
@@ -1,5 +1,5 @@
 use amplify::DumbDefault;
-use lnp::ChannelId as SwapId;
+use lnp::p2p::legacy::ChannelId as SwapId;
 use std::collections::HashSet;
 use std::fmt::{self, Display, Formatter};
 use std::io;

diff --git a/src/rpc/request.rs b/src/rpc/request.rs
@@ -69,8 +69,7 @@ use farcaster_core::{
 };
 use internet2::Api;
 use internet2::{NodeAddr, RemoteSocketAddr};
-use lnp::payment::{self, AssetsBalance, Lifecycle};
-use lnp::{message, Messages, TempChannelId as TempSwapId};
+use lnp::p2p::legacy::{Messages, Ping, TempChannelId as TempSwapId};
 use microservices::rpc::Failure;
 use microservices::rpc_connection;
 use strict_encoding::{
@@ -104,7 +103,7 @@ pub enum Msg {
     BuyProcedureSignature(protocol_message::BuyProcedureSignature<BtcXmr>),
     #[api(type = 29)]
     #[display(inner)]
-    Ping(message::Ping),
+    Ping(Ping),
     #[api(type = 31)]
     #[display("pong(...)")]
     Pong(Vec<u8>),
@@ -852,9 +851,9 @@ pub struct SwapInfo {
     //// FIXME serde::Serialize/Deserialize missing
     // #[serde_as(as = "Option<DisplayFromStr)>")]
     // pub params: Option<Params>,
-    pub local_keys: payment::channel::Keyset,
+    pub local_keys: lnp::channel::bolt::LocalKeyset,
     #[serde_as(as = "BTreeMap<DisplayFromStr, Same>")]
-    pub remote_keys: BTreeMap<NodeAddr, payment::channel::Keyset>,
+    pub remote_keys: BTreeMap<NodeAddr, lnp::channel::bolt::RemoteKeyset>,
 }
 
 #[cfg(feature = "serde")]

diff --git a/src/syncerd/runtime.rs b/src/syncerd/runtime.rs
@@ -34,7 +34,6 @@ use farcaster_core::swap::SwapId;
 use internet2::{
     presentation, transport, zmqsocket, NodeAddr, RemoteSocketAddr, TypedEnum, ZmqType, ZMQ_CONTEXT,
 };
-use lnp::{message, Messages, TempChannelId as TempSwapId};
 use microservices::esb::{self, Handler};
 use microservices::rpc::Failure;