Skip to content

Commit 34d3282

Browse files
committed
refactor: avoid duplication in send_block_response
1 parent 23b7b44 commit 34d3282

File tree

1 file changed

+18
-22
lines changed

1 file changed

+18
-22
lines changed

stacks-signer/src/v0/signer.rs

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,22 @@ impl Signer {
478478
}
479479
}
480480

481+
/// The actual `send_block_response` implementation. Declared so that we do
482+
/// not need to duplicate in testing.
483+
fn impl_send_block_response(&mut self, block_response: BlockResponse) {
484+
let res = self
485+
.stackerdb
486+
.send_message_with_retry::<SignerMessage>(block_response.clone().into());
487+
match res {
488+
Err(e) => warn!("{self}: Failed to send block rejection to stacker-db: {e:?}"),
489+
Ok(ack) if !ack.accepted => warn!(
490+
"{self}: Block rejection not accepted by stacker-db: {:?}",
491+
ack.reason
492+
),
493+
Ok(_) => debug!("{self}: Block rejection accepted by stacker-db"),
494+
}
495+
}
496+
481497
#[cfg(any(test, feature = "testing"))]
482498
fn send_block_response(&mut self, block_response: BlockResponse) {
483499
const NUM_REPEATS: usize = 1;
@@ -489,17 +505,7 @@ impl Signer {
489505
count = NUM_REPEATS;
490506
}
491507
while count <= NUM_REPEATS {
492-
let res = self
493-
.stackerdb
494-
.send_message_with_retry::<SignerMessage>(block_response.clone().into());
495-
match res {
496-
Err(e) => warn!("{self}: Failed to send block rejection to stacker-db: {e:?}"),
497-
Ok(ack) if !ack.accepted => warn!(
498-
"{self}: Block rejection not accepted by stacker-db: {:?}",
499-
ack.reason
500-
),
501-
Ok(_) => debug!("{self}: Block rejection accepted by stacker-db"),
502-
}
508+
self.impl_send_block_response(block_response.clone());
503509

504510
count += 1;
505511
sleep_ms(1000);
@@ -508,17 +514,7 @@ impl Signer {
508514

509515
#[cfg(not(any(test, feature = "testing")))]
510516
fn send_block_response(&mut self, block_response: BlockResponse) {
511-
let res = self
512-
.stackerdb
513-
.send_message_with_retry::<SignerMessage>(block_response.clone().into());
514-
match res {
515-
Err(e) => warn!("{self}: Failed to send block rejection to stacker-db: {e:?}"),
516-
Ok(ack) if !ack.accepted => warn!(
517-
"{self}: Block rejection not accepted by stacker-db: {:?}",
518-
ack.reason
519-
),
520-
Ok(_) => debug!("{self}: Block rejection accepted by stacker-db"),
521-
}
517+
self.impl_send_block_response(block_response)
522518
}
523519

524520
/// Handle block proposal messages submitted to signers stackerdb

0 commit comments

Comments
 (0)