Skip to content

fix: do not wrap Sender with Arc #6315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LesnyRumcajs merged 1 commit into from
Dec 8, 2025
Merged

fix: do not wrap Sender with Arc #6315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 36 additions & 12 deletions src/message_pool/msgpool/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pub mod selection;
pub mod test_provider;
pub(in crate::message_pool) mod utils;

use std::{borrow::BorrowMut, cmp::Ordering, sync::Arc};
use std::{borrow::BorrowMut, cmp::Ordering};

use crate::blocks::Tipset;
use crate::libp2p::{NetworkMessage, PUBSUB_MSG_STR, Topic};
Expand Down Expand Up @@ -213,7 +213,7 @@ where
pub async fn head_change<T>(
api: &T,
bls_sig_cache: &SizeTrackingLruCache<CidWrapper, Signature>,
repub_trigger: Arc<flume::Sender<()>>,
repub_trigger: flume::Sender<()>,
republished: &SyncRwLock<HashSet<Cid>>,
pending: &SyncRwLock<HashMap<Address, MsgSet>>,
cur_tipset: &SyncRwLock<Tipset>,
Expand Down Expand Up @@ -356,8 +356,14 @@ pub mod tests {

let (tx, _rx) = flume::bounded(50);
let mut services = JoinSet::new();
let mpool =
MessagePool::new(tma, tx, Default::default(), Arc::default(), &mut services).unwrap();
let mpool = MessagePool::new(
tma,
tx,
Default::default(),
Default::default(),
&mut services,
)
.unwrap();
let mut smsg_vec = Vec::new();
for i in 0..(mpool.api.max_actor_pending_messages() + 1) {
let msg = create_smsg(&target, &sender, wallet.borrow_mut(), i, 1000000, 1);
Expand Down Expand Up @@ -436,8 +442,14 @@ pub mod tests {

let (tx, _rx) = flume::bounded(50);
let mut services = JoinSet::new();
let mpool =
MessagePool::new(tma, tx, Default::default(), Arc::default(), &mut services).unwrap();
let mpool = MessagePool::new(
tma,
tx,
Default::default(),
Default::default(),
&mut services,
)
.unwrap();
let mut smsg_vec = Vec::new();
for i in 0..2 {
let msg = create_smsg(&target, &sender, wallet.borrow_mut(), i, 1000000, 1);
Expand All @@ -458,7 +470,7 @@ pub mod tests {
let bls_sig_cache = mpool.bls_sig_cache.clone();
let pending = mpool.pending.clone();
let cur_tipset = mpool.cur_tipset.clone();
let repub_trigger = Arc::new(mpool.repub_trigger.clone());
let repub_trigger = mpool.repub_trigger.clone();
let republished = mpool.republished.clone();
head_change(
api.as_ref(),
Expand Down Expand Up @@ -497,8 +509,14 @@ pub mod tests {
}
let (tx, _rx) = flume::bounded(50);
let mut services = JoinSet::new();
let mpool =
MessagePool::new(tma, tx, Default::default(), Arc::default(), &mut services).unwrap();
let mpool = MessagePool::new(
tma,
tx,
Default::default(),
Default::default(),
&mut services,
)
.unwrap();

{
let mut api_temp = mpool.api.inner.lock();
Expand All @@ -519,7 +537,7 @@ pub mod tests {
let bls_sig_cache = mpool.bls_sig_cache.clone();
let pending = mpool.pending.clone();
let cur_tipset = mpool.cur_tipset.clone();
let repub_trigger = Arc::new(mpool.repub_trigger.clone());
let repub_trigger = mpool.repub_trigger.clone();
let republished = mpool.republished.clone();
head_change(
api.as_ref(),
Expand Down Expand Up @@ -590,8 +608,14 @@ pub mod tests {
tma.set_state_sequence(&sender, 0);
let (tx, _rx) = flume::bounded(50);
let mut services = JoinSet::new();
let mpool =
MessagePool::new(tma, tx, Default::default(), Arc::default(), &mut services).unwrap();
let mpool = MessagePool::new(
tma,
tx,
Default::default(),
Default::default(),
&mut services,
)
.unwrap();

let mut smsg_vec = Vec::new();
for i in 0..3 {
Expand Down
2 changes: 1 addition & 1 deletion src/message_pool/msgpool/msg_pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ where
let republished = mp.republished.clone();

let cur_tipset = mp.cur_tipset.clone();
let repub_trigger = Arc::new(mp.repub_trigger.clone());
let repub_trigger = mp.repub_trigger.clone();

// Reacts to new HeadChanges
services.spawn(async move {
Expand Down
4 changes: 2 additions & 2 deletions src/message_pool/msgpool/selection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@ mod test_selection {
let bls_sig_cache = mpool.bls_sig_cache.clone();
let pending = mpool.pending.clone();
let cur_tipset = mpool.cur_tipset.clone();
let repub_trigger = Arc::new(mpool.repub_trigger.clone());
let repub_trigger = mpool.repub_trigger.clone();
let republished = mpool.republished.clone();

head_change(
Expand Down Expand Up @@ -943,7 +943,7 @@ mod test_selection {
let bls_sig_cache = mpool.bls_sig_cache.clone();
let pending = mpool.pending.clone();
let cur_tipset = mpool.cur_tipset.clone();
let repub_trigger = Arc::new(mpool.repub_trigger.clone());
let repub_trigger = mpool.repub_trigger.clone();
let republished = mpool.republished.clone();

head_change(
Expand Down
Loading