Skip to content

Commit 6ef7d22

Browse files
committed
Add libsigner to clippy CI and fix errors
Signed-off-by: Jacinta Ferrant <[email protected]>
1 parent a70ec7c commit 6ef7d22

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

.github/workflows/clippy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ jobs:
3737
uses: actions-rs/clippy-check@v1
3838
with:
3939
token: ${{ secrets.GITHUB_TOKEN }}
40-
args: -p libstackerdb -p stacks-signer -p pox-locking -p clarity --no-deps --tests --all-features -- -D warnings
40+
args: -p libstackerdb -p stacks-signer -p pox-locking -p clarity -p libsigner --no-deps --tests --all-features -- -D warnings

libsigner/src/runloop.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,8 @@ impl<EV: EventReceiver<T>, R, T: SignerEventTrait> RunningSigner<EV, R, T> {
120120
pub fn join(self) -> Option<R> {
121121
debug!("Try join event loop...");
122122
// wait for event receiver join
123-
let _ = self.event_join.join().map_err(|thread_panic| {
123+
let _ = self.event_join.join().inspect_err(|thread_panic| {
124124
error!("Event thread panicked with: '{:?}'", &thread_panic);
125-
thread_panic
126125
});
127126
info!("Event receiver thread joined");
128127

@@ -131,9 +130,8 @@ impl<EV: EventReceiver<T>, R, T: SignerEventTrait> RunningSigner<EV, R, T> {
131130
let result_opt = self
132131
.signer_join
133132
.join()
134-
.map_err(|thread_panic| {
133+
.inspect_err(|thread_panic| {
135134
error!("Event thread panicked with: '{:?}'", &thread_panic);
136-
thread_panic
137135
})
138136
.unwrap_or(None);
139137

0 commit comments

Comments
 (0)