Skip to content

Commit 3234fcb

Browse files
author
Ivo Georgiev
committed
cargo fmt
1 parent 4b0bd4f commit 3234fcb

File tree

2 files changed

+16
-22
lines changed

2 files changed

+16
-22
lines changed

adapter/src/ethereum.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,9 @@ pub fn ewt_sign(
377377

378378
let payload_encoded =
379379
base64::encode_config(&serde_json::to_string(payload)?, base64::URL_SAFE_NO_PAD);
380-
let message = Message::from_slice(&hash_message(&format!(
381-
"{}.{}",
382-
header_encoded, payload_encoded
383-
).as_bytes()));
380+
let message = Message::from_slice(&hash_message(
381+
&format!("{}.{}", header_encoded, payload_encoded).as_bytes(),
382+
));
384383
let signature: Signature = signer
385384
.sign(password, &message)
386385
.map_err(|_| map_error("sign message"))?
@@ -400,10 +399,9 @@ pub fn ewt_verify(
400399
payload_encoded: &str,
401400
token: &str,
402401
) -> Result<VerifyPayload, Box<dyn Error>> {
403-
let message = Message::from_slice(&hash_message(&format!(
404-
"{}.{}",
405-
header_encoded, payload_encoded
406-
).as_bytes()));
402+
let message = Message::from_slice(&hash_message(
403+
&format!("{}.{}", header_encoded, payload_encoded).as_bytes(),
404+
));
407405

408406
let decoded_signature = base64::decode_config(&token, base64::URL_SAFE_NO_PAD)?;
409407
let signature = Signature::from_electrum(&decoded_signature);

validator_worker/src/main.rs

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -197,20 +197,16 @@ async fn validator_tick<A: Adapter + 'static>(
197197
let duration = Duration::from_millis(config.validator_tick_timeout as u64);
198198

199199
match channel.spec.validators.find(&whoami) {
200-
SpecValidator::Leader(_) => {
201-
match timeout(duration, leader::tick(&sentry)).await {
202-
Err(e) => return Err(ValidatorWorkerError::Failed(e.to_string())),
203-
Ok(Err(e)) => return Err(ValidatorWorkerError::Failed(e.to_string())),
204-
_ => ()
205-
}
206-
}
207-
SpecValidator::Follower(_) => {
208-
match timeout(duration, follower::tick(&sentry)).await {
209-
Err(e) => return Err(ValidatorWorkerError::Failed(e.to_string())),
210-
Ok(Err(e)) => return Err(ValidatorWorkerError::Failed(e.to_string())),
211-
_ => ()
212-
}
213-
}
200+
SpecValidator::Leader(_) => match timeout(duration, leader::tick(&sentry)).await {
201+
Err(e) => return Err(ValidatorWorkerError::Failed(e.to_string())),
202+
Ok(Err(e)) => return Err(ValidatorWorkerError::Failed(e.to_string())),
203+
_ => (),
204+
},
205+
SpecValidator::Follower(_) => match timeout(duration, follower::tick(&sentry)).await {
206+
Err(e) => return Err(ValidatorWorkerError::Failed(e.to_string())),
207+
Ok(Err(e)) => return Err(ValidatorWorkerError::Failed(e.to_string())),
208+
_ => (),
209+
},
214210
SpecValidator::None => {
215211
return Err(ValidatorWorkerError::Failed(
216212
"validatorTick: processing a channel where we are not validating".to_string(),

0 commit comments

Comments
 (0)