Skip to content

Commit 82c8701

Browse files
committed
chore: formatting
1 parent ce9fb34 commit 82c8701

File tree

3 files changed

+36
-9
lines changed

3 files changed

+36
-9
lines changed

stackslib/src/chainstate/stacks/miner.rs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,8 +1406,16 @@ impl<'a> StacksMicroblockBuilder<'a> {
14061406
self.runtime.num_mined = num_txs;
14071407

14081408
mem_pool.drop_txs(&invalidated_txs)?;
1409-
event_dispatcher.mempool_txs_dropped(invalidated_txs, None, MemPoolDropReason::TOO_EXPENSIVE);
1410-
event_dispatcher.mempool_txs_dropped(to_drop_and_blacklist, None, MemPoolDropReason::PROBLEMATIC);
1409+
event_dispatcher.mempool_txs_dropped(
1410+
invalidated_txs,
1411+
None,
1412+
MemPoolDropReason::TOO_EXPENSIVE,
1413+
);
1414+
event_dispatcher.mempool_txs_dropped(
1415+
to_drop_and_blacklist,
1416+
None,
1417+
MemPoolDropReason::PROBLEMATIC,
1418+
);
14111419

14121420
if blocked {
14131421
debug!(
@@ -2506,7 +2514,11 @@ impl StacksBlockBuilder {
25062514

25072515
if let Some(observer) = event_observer {
25082516
observer.mempool_txs_dropped(invalidated_txs, None, MemPoolDropReason::TOO_EXPENSIVE);
2509-
observer.mempool_txs_dropped(to_drop_and_blacklist, None, MemPoolDropReason::PROBLEMATIC);
2517+
observer.mempool_txs_dropped(
2518+
to_drop_and_blacklist,
2519+
None,
2520+
MemPoolDropReason::PROBLEMATIC,
2521+
);
25102522
}
25112523

25122524
if let Err(e) = result {

stackslib/src/core/mempool.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,12 @@ pub trait ProposalCallbackReceiver: Send {
390390

391391
pub trait MemPoolEventDispatcher {
392392
fn get_proposal_callback_receiver(&self) -> Option<Box<dyn ProposalCallbackReceiver>>;
393-
fn mempool_txs_dropped(&self, txids: Vec<Txid>, new_txid: Option<Txid>, reason: MemPoolDropReason);
393+
fn mempool_txs_dropped(
394+
&self,
395+
txids: Vec<Txid>,
396+
new_txid: Option<Txid>,
397+
reason: MemPoolDropReason,
398+
);
394399
fn mined_block_event(
395400
&self,
396401
target_burn_height: u64,

testnet/stacks-node/src/event_dispatcher.rs

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,12 @@ impl ProposalCallbackReceiver for ProposalCallbackHandler {
951951
}
952952

953953
impl MemPoolEventDispatcher for EventDispatcher {
954-
fn mempool_txs_dropped(&self, txids: Vec<Txid>, new_txid: Option<Txid>, reason: MemPoolDropReason) {
954+
fn mempool_txs_dropped(
955+
&self,
956+
txids: Vec<Txid>,
957+
new_txid: Option<Txid>,
958+
reason: MemPoolDropReason,
959+
) {
955960
if !txids.is_empty() {
956961
self.process_dropped_mempool_txs(txids, new_txid, reason)
957962
}
@@ -1572,7 +1577,12 @@ impl EventDispatcher {
15721577
}
15731578
}
15741579

1575-
pub fn process_dropped_mempool_txs(&self, txs: Vec<Txid>, new_txid: Option<Txid>, reason: MemPoolDropReason) {
1580+
pub fn process_dropped_mempool_txs(
1581+
&self,
1582+
txs: Vec<Txid>,
1583+
new_txid: Option<Txid>,
1584+
reason: MemPoolDropReason,
1585+
) {
15761586
// lazily assemble payload only if we have observers
15771587
let interested_observers = self.filter_observers(&self.mempool_observers_lookup, true);
15781588

@@ -1584,15 +1594,15 @@ impl EventDispatcher {
15841594
.into_iter()
15851595
.map(|tx| serde_json::Value::String(format!("0x{}", &tx)))
15861596
.collect();
1587-
1588-
let payload = match new_txid{
1597+
1598+
let payload = match new_txid {
15891599
Some(id) => {
15901600
json!({
15911601
"dropped_txids": serde_json::Value::Array(dropped_txids),
15921602
"reason": reason.to_string(),
15931603
"new_txid": format!("0x{}", &id),
15941604
})
1595-
},
1605+
}
15961606
None => {
15971607
json!({
15981608
"dropped_txids": serde_json::Value::Array(dropped_txids),

0 commit comments

Comments
 (0)