Skip to content

Commit

Permalink
Fix tests/clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
petertdavies committed May 10, 2022
1 parent 1bb997b commit 1f8f9a1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 2 additions & 0 deletions testing/web3signer_tests/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,8 @@ mod tests {
url: signer_rig.url.to_string(),
root_certificate_path: Some(root_certificate_path()),
request_timeout_ms: None,
client_identity_path: None,
client_identity_password: None,
},
};
ValidatorStoreRig::new(vec![validator_definition], spec).await
Expand Down
2 changes: 2 additions & 0 deletions validator_client/src/http_api/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,8 @@ impl ApiTester {
url: format!("http://signer_{}.com/", i),
root_certificate_path: None,
request_timeout_ms: None,
client_identity_path: None,
client_identity_password: None,
}
})
.collect();
Expand Down
2 changes: 2 additions & 0 deletions validator_client/src/http_api/tests/keystores.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ fn web3signer_validator_with_pubkey(pubkey: PublicKey) -> Web3SignerValidatorReq
url: web3_signer_url(),
root_certificate_path: None,
request_timeout_ms: None,
client_identity_path: None,
client_identity_password: None,
}
}

Expand Down
6 changes: 2 additions & 4 deletions validator_client/src/initialized_validators.rs
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,8 @@ impl InitializedValidator {
};

let builder = if let Some(path) = client_identity_path {
let identity = load_pkcs12_identity(
path,
&client_identity_password.unwrap_or(String::new()),
)?;
let identity =
load_pkcs12_identity(path, &client_identity_password.unwrap_or_default())?;
builder.identity(identity)
} else {
builder
Expand Down

0 comments on commit 1f8f9a1

Please sign in to comment.