From cd6749e8f7e236a5194a704a4600055e82232dd0 Mon Sep 17 00:00:00 2001 From: Boog900 <54e72d8a-345f-4599-bd90-c6b9bc7d0ec5@aleeas.com> Date: Tue, 15 Oct 2024 18:16:43 +0100 Subject: [PATCH] fix CI --- binaries/cuprated/src/txpool/incoming_tx.rs | 1 - p2p/p2p/src/lib.rs | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/binaries/cuprated/src/txpool/incoming_tx.rs b/binaries/cuprated/src/txpool/incoming_tx.rs index 4abb7ad0..f87412dd 100644 --- a/binaries/cuprated/src/txpool/incoming_tx.rs +++ b/binaries/cuprated/src/txpool/incoming_tx.rs @@ -332,7 +332,6 @@ async fn rerelay_stem_tx( let incoming_tx = IncomingTxBuilder::new(DandelionTx(Bytes::copy_from_slice(&tx_blob)), *tx_hash); - // TODO: fill this in properly. let incoming_tx = incoming_tx .with_routing_state(state) .with_state_in_db(Some(State::Stem)) diff --git a/p2p/p2p/src/lib.rs b/p2p/p2p/src/lib.rs index 4c1d691c..541784c9 100644 --- a/p2p/p2p/src/lib.rs +++ b/p2p/p2p/src/lib.rs @@ -18,7 +18,7 @@ use cuprate_p2p_core::{ pub mod block_downloader; mod broadcast; -mod client_pool; +pub mod client_pool; pub mod config; pub mod connection_maintainer; pub mod constants; @@ -26,7 +26,7 @@ mod inbound_server; use block_downloader::{BlockBatch, BlockDownloaderConfig, ChainSvcRequest, ChainSvcResponse}; pub use broadcast::{BroadcastRequest, BroadcastSvc}; -pub use client_pool::ClientPoolDropGuard; +pub use client_pool::{ClientPool, ClientPoolDropGuard}; pub use config::{AddressBookConfig, P2PConfig}; use connection_maintainer::MakeConnectionRequest; @@ -83,7 +83,7 @@ where let outbound_handshaker = outbound_handshaker_builder.build(); - let client_pool = client_pool::ClientPool::new(); + let client_pool = ClientPool::new(); let (make_connection_tx, make_connection_rx) = mpsc::channel(3); @@ -133,7 +133,7 @@ where #[derive(Clone)] pub struct NetworkInterface { /// A pool of free connected peers. - pool: Arc>, + pool: Arc>, /// A [`Service`] that allows broadcasting to all connected peers. broadcast_svc: BroadcastSvc, /// A channel to request extra connections. @@ -174,7 +174,7 @@ impl NetworkInterface { } /// Borrows the `ClientPool`, for access to connected peers. - pub const fn client_pool(&self) -> &Arc> { + pub const fn client_pool(&self) -> &Arc> { &self.pool } }