Skip to content

Commit 8654e5f

Browse files
ManuelBilbaoManuelBilbao
committed
Fix format
1 parent 4d39e7e commit 8654e5f

File tree

4 files changed

+77
-163
lines changed

4 files changed

+77
-163
lines changed

‎crates/cli/src/docker_init.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,9 @@ pub async fn handle_docker_init(config_path: String, output_dir: String) -> Resu
158158

159159
// depends_on
160160
let mut module_dependencies = IndexMap::new();
161-
module_dependencies.insert(
162-
"cb_signer".into(),
163-
DependsCondition { condition: "service_healthy".into() },
164-
);
161+
module_dependencies.insert("cb_signer".into(), DependsCondition {
162+
condition: "service_healthy".into(),
163+
});
165164

166165
Service {
167166
container_name: Some(module_cid.clone()),

‎crates/common/src/config/signer.rs‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,12 @@ impl StartSignerConfig {
104104
server_domain,
105105
..
106106
}) => {
107-
let cert_path = load_env_var(SIGNER_DIRK_CERT_ENV)
108-
.map(|path| PathBuf::from(path))
109-
.unwrap_or(cert_path);
110-
let key_path = load_env_var(SIGNER_DIRK_KEY_ENV)
111-
.map(|path| PathBuf::from(path))
112-
.unwrap_or(key_path);
113-
let ca_cert_path = load_env_var(SIGNER_DIRK_CA_CERT_ENV)
114-
.map(|path| PathBuf::from(path))
115-
.ok()
116-
.or(ca_cert_path);
107+
let cert_path =
108+
load_env_var(SIGNER_DIRK_CERT_ENV).map(PathBuf::from).unwrap_or(cert_path);
109+
let key_path =
110+
load_env_var(SIGNER_DIRK_KEY_ENV).map(PathBuf::from).unwrap_or(key_path);
111+
let ca_cert_path =
112+
load_env_var(SIGNER_DIRK_CA_CERT_ENV).map(PathBuf::from).ok().or(ca_cert_path);
117113

118114
Ok(StartSignerConfig {
119115
chain: config.chain,

‎crates/signer/src/proto/v1.rs‎

Lines changed: 64 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ impl ResponseState {
2424
/// String value of the enum field names used in the ProtoBuf definition.
2525
///
2626
/// The values are not transformed in any way and thus are considered stable
27-
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
27+
/// (if the ProtoBuf definition does not change) and safe for programmatic
28+
/// use.
2829
pub fn as_str_name(&self) -> &'static str {
2930
match self {
3031
Self::Unknown => "UNKNOWN",
@@ -89,10 +90,9 @@ pub mod lister_client {
8990
dead_code,
9091
missing_docs,
9192
clippy::wildcard_imports,
92-
clippy::let_unit_value,
93+
clippy::let_unit_value
9394
)]
94-
use tonic::codegen::*;
95-
use tonic::codegen::http::Uri;
95+
use tonic::codegen::{http::Uri, *};
9696
#[derive(Debug, Clone)]
9797
pub struct ListerClient<T> {
9898
inner: tonic::client::Grpc<T>,
@@ -136,16 +136,15 @@ pub mod lister_client {
136136
<T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
137137
>,
138138
>,
139-
<T as tonic::codegen::Service<
140-
http::Request<tonic::body::BoxBody>,
141-
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
139+
<T as tonic::codegen::Service<http::Request<tonic::body::BoxBody>>>::Error:
140+
Into<StdError> + std::marker::Send + std::marker::Sync,
142141
{
143142
ListerClient::new(InterceptedService::new(inner, interceptor))
144143
}
145144
/// Compress requests with the given encoding.
146145
///
147-
/// This requires the server to support it otherwise it might respond with an
148-
/// error.
146+
/// This requires the server to support it otherwise it might respond
147+
/// with an error.
149148
#[must_use]
150149
pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
151150
self.inner = self.inner.send_compressed(encoding);
@@ -176,18 +175,11 @@ pub mod lister_client {
176175
pub async fn list_accounts(
177176
&mut self,
178177
request: impl tonic::IntoRequest<super::ListAccountsRequest>,
179-
) -> std::result::Result<
180-
tonic::Response<super::ListAccountsResponse>,
181-
tonic::Status,
182-
> {
183-
self.inner
184-
.ready()
185-
.await
186-
.map_err(|e| {
187-
tonic::Status::unknown(
188-
format!("Service was not ready: {}", e.into()),
189-
)
190-
})?;
178+
) -> std::result::Result<tonic::Response<super::ListAccountsResponse>, tonic::Status>
179+
{
180+
self.inner.ready().await.map_err(|e| {
181+
tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
182+
})?;
191183
let codec = tonic::codec::ProstCodec::default();
192184
let path = http::uri::PathAndQuery::from_static("/v1.Lister/ListAccounts");
193185
let mut req = request.into_request();
@@ -247,10 +239,9 @@ pub mod account_manager_client {
247239
dead_code,
248240
missing_docs,
249241
clippy::wildcard_imports,
250-
clippy::let_unit_value,
242+
clippy::let_unit_value
251243
)]
252-
use tonic::codegen::*;
253-
use tonic::codegen::http::Uri;
244+
use tonic::codegen::{http::Uri, *};
254245
#[derive(Debug, Clone)]
255246
pub struct AccountManagerClient<T> {
256247
inner: tonic::client::Grpc<T>,
@@ -294,16 +285,15 @@ pub mod account_manager_client {
294285
<T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
295286
>,
296287
>,
297-
<T as tonic::codegen::Service<
298-
http::Request<tonic::body::BoxBody>,
299-
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
288+
<T as tonic::codegen::Service<http::Request<tonic::body::BoxBody>>>::Error:
289+
Into<StdError> + std::marker::Send + std::marker::Sync,
300290
{
301291
AccountManagerClient::new(InterceptedService::new(inner, interceptor))
302292
}
303293
/// Compress requests with the given encoding.
304294
///
305-
/// This requires the server to support it otherwise it might respond with an
306-
/// error.
295+
/// This requires the server to support it otherwise it might respond
296+
/// with an error.
307297
#[must_use]
308298
pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
309299
self.inner = self.inner.send_compressed(encoding);
@@ -334,18 +324,11 @@ pub mod account_manager_client {
334324
pub async fn unlock(
335325
&mut self,
336326
request: impl tonic::IntoRequest<super::UnlockAccountRequest>,
337-
) -> std::result::Result<
338-
tonic::Response<super::UnlockAccountResponse>,
339-
tonic::Status,
340-
> {
341-
self.inner
342-
.ready()
343-
.await
344-
.map_err(|e| {
345-
tonic::Status::unknown(
346-
format!("Service was not ready: {}", e.into()),
347-
)
348-
})?;
327+
) -> std::result::Result<tonic::Response<super::UnlockAccountResponse>, tonic::Status>
328+
{
329+
self.inner.ready().await.map_err(|e| {
330+
tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
331+
})?;
349332
let codec = tonic::codec::ProstCodec::default();
350333
let path = http::uri::PathAndQuery::from_static("/v1.AccountManager/Unlock");
351334
let mut req = request.into_request();
@@ -355,18 +338,11 @@ pub mod account_manager_client {
355338
pub async fn lock(
356339
&mut self,
357340
request: impl tonic::IntoRequest<super::LockAccountRequest>,
358-
) -> std::result::Result<
359-
tonic::Response<super::LockAccountResponse>,
360-
tonic::Status,
361-
> {
362-
self.inner
363-
.ready()
364-
.await
365-
.map_err(|e| {
366-
tonic::Status::unknown(
367-
format!("Service was not ready: {}", e.into()),
368-
)
369-
})?;
341+
) -> std::result::Result<tonic::Response<super::LockAccountResponse>, tonic::Status>
342+
{
343+
self.inner.ready().await.map_err(|e| {
344+
tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
345+
})?;
370346
let codec = tonic::codec::ProstCodec::default();
371347
let path = http::uri::PathAndQuery::from_static("/v1.AccountManager/Lock");
372348
let mut req = request.into_request();
@@ -376,25 +352,14 @@ pub mod account_manager_client {
376352
pub async fn generate(
377353
&mut self,
378354
request: impl tonic::IntoRequest<super::GenerateRequest>,
379-
) -> std::result::Result<
380-
tonic::Response<super::GenerateResponse>,
381-
tonic::Status,
382-
> {
383-
self.inner
384-
.ready()
385-
.await
386-
.map_err(|e| {
387-
tonic::Status::unknown(
388-
format!("Service was not ready: {}", e.into()),
389-
)
390-
})?;
355+
) -> std::result::Result<tonic::Response<super::GenerateResponse>, tonic::Status> {
356+
self.inner.ready().await.map_err(|e| {
357+
tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
358+
})?;
391359
let codec = tonic::codec::ProstCodec::default();
392-
let path = http::uri::PathAndQuery::from_static(
393-
"/v1.AccountManager/Generate",
394-
);
360+
let path = http::uri::PathAndQuery::from_static("/v1.AccountManager/Generate");
395361
let mut req = request.into_request();
396-
req.extensions_mut()
397-
.insert(GrpcMethod::new("v1.AccountManager", "Generate"));
362+
req.extensions_mut().insert(GrpcMethod::new("v1.AccountManager", "Generate"));
398363
self.inner.unary(req, path, codec).await
399364
}
400365
}
@@ -521,10 +486,9 @@ pub mod signer_client {
521486
dead_code,
522487
missing_docs,
523488
clippy::wildcard_imports,
524-
clippy::let_unit_value,
489+
clippy::let_unit_value
525490
)]
526-
use tonic::codegen::*;
527-
use tonic::codegen::http::Uri;
491+
use tonic::codegen::{http::Uri, *};
528492
#[derive(Debug, Clone)]
529493
pub struct SignerClient<T> {
530494
inner: tonic::client::Grpc<T>,
@@ -568,16 +532,15 @@ pub mod signer_client {
568532
<T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
569533
>,
570534
>,
571-
<T as tonic::codegen::Service<
572-
http::Request<tonic::body::BoxBody>,
573-
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
535+
<T as tonic::codegen::Service<http::Request<tonic::body::BoxBody>>>::Error:
536+
Into<StdError> + std::marker::Send + std::marker::Sync,
574537
{
575538
SignerClient::new(InterceptedService::new(inner, interceptor))
576539
}
577540
/// Compress requests with the given encoding.
578541
///
579-
/// This requires the server to support it otherwise it might respond with an
580-
/// error.
542+
/// This requires the server to support it otherwise it might respond
543+
/// with an error.
581544
#[must_use]
582545
pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
583546
self.inner = self.inner.send_compressed(encoding);
@@ -609,14 +572,9 @@ pub mod signer_client {
609572
&mut self,
610573
request: impl tonic::IntoRequest<super::SignRequest>,
611574
) -> std::result::Result<tonic::Response<super::SignResponse>, tonic::Status> {
612-
self.inner
613-
.ready()
614-
.await
615-
.map_err(|e| {
616-
tonic::Status::unknown(
617-
format!("Service was not ready: {}", e.into()),
618-
)
619-
})?;
575+
self.inner.ready().await.map_err(|e| {
576+
tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
577+
})?;
620578
let codec = tonic::codec::ProstCodec::default();
621579
let path = http::uri::PathAndQuery::from_static("/v1.Signer/Sign");
622580
let mut req = request.into_request();
@@ -626,18 +584,10 @@ pub mod signer_client {
626584
pub async fn multisign(
627585
&mut self,
628586
request: impl tonic::IntoRequest<super::MultisignRequest>,
629-
) -> std::result::Result<
630-
tonic::Response<super::MultisignResponse>,
631-
tonic::Status,
632-
> {
633-
self.inner
634-
.ready()
635-
.await
636-
.map_err(|e| {
637-
tonic::Status::unknown(
638-
format!("Service was not ready: {}", e.into()),
639-
)
640-
})?;
587+
) -> std::result::Result<tonic::Response<super::MultisignResponse>, tonic::Status> {
588+
self.inner.ready().await.map_err(|e| {
589+
tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
590+
})?;
641591
let codec = tonic::codec::ProstCodec::default();
642592
let path = http::uri::PathAndQuery::from_static("/v1.Signer/Multisign");
643593
let mut req = request.into_request();
@@ -648,66 +598,39 @@ pub mod signer_client {
648598
&mut self,
649599
request: impl tonic::IntoRequest<super::SignBeaconAttestationRequest>,
650600
) -> std::result::Result<tonic::Response<super::SignResponse>, tonic::Status> {
651-
self.inner
652-
.ready()
653-
.await
654-
.map_err(|e| {
655-
tonic::Status::unknown(
656-
format!("Service was not ready: {}", e.into()),
657-
)
658-
})?;
601+
self.inner.ready().await.map_err(|e| {
602+
tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
603+
})?;
659604
let codec = tonic::codec::ProstCodec::default();
660-
let path = http::uri::PathAndQuery::from_static(
661-
"/v1.Signer/SignBeaconAttestation",
662-
);
605+
let path = http::uri::PathAndQuery::from_static("/v1.Signer/SignBeaconAttestation");
663606
let mut req = request.into_request();
664-
req.extensions_mut()
665-
.insert(GrpcMethod::new("v1.Signer", "SignBeaconAttestation"));
607+
req.extensions_mut().insert(GrpcMethod::new("v1.Signer", "SignBeaconAttestation"));
666608
self.inner.unary(req, path, codec).await
667609
}
668610
pub async fn sign_beacon_attestations(
669611
&mut self,
670612
request: impl tonic::IntoRequest<super::SignBeaconAttestationsRequest>,
671-
) -> std::result::Result<
672-
tonic::Response<super::MultisignResponse>,
673-
tonic::Status,
674-
> {
675-
self.inner
676-
.ready()
677-
.await
678-
.map_err(|e| {
679-
tonic::Status::unknown(
680-
format!("Service was not ready: {}", e.into()),
681-
)
682-
})?;
613+
) -> std::result::Result<tonic::Response<super::MultisignResponse>, tonic::Status> {
614+
self.inner.ready().await.map_err(|e| {
615+
tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
616+
})?;
683617
let codec = tonic::codec::ProstCodec::default();
684-
let path = http::uri::PathAndQuery::from_static(
685-
"/v1.Signer/SignBeaconAttestations",
686-
);
618+
let path = http::uri::PathAndQuery::from_static("/v1.Signer/SignBeaconAttestations");
687619
let mut req = request.into_request();
688-
req.extensions_mut()
689-
.insert(GrpcMethod::new("v1.Signer", "SignBeaconAttestations"));
620+
req.extensions_mut().insert(GrpcMethod::new("v1.Signer", "SignBeaconAttestations"));
690621
self.inner.unary(req, path, codec).await
691622
}
692623
pub async fn sign_beacon_proposal(
693624
&mut self,
694625
request: impl tonic::IntoRequest<super::SignBeaconProposalRequest>,
695626
) -> std::result::Result<tonic::Response<super::SignResponse>, tonic::Status> {
696-
self.inner
697-
.ready()
698-
.await
699-
.map_err(|e| {
700-
tonic::Status::unknown(
701-
format!("Service was not ready: {}", e.into()),
702-
)
703-
})?;
627+
self.inner.ready().await.map_err(|e| {
628+
tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
629+
})?;
704630
let codec = tonic::codec::ProstCodec::default();
705-
let path = http::uri::PathAndQuery::from_static(
706-
"/v1.Signer/SignBeaconProposal",
707-
);
631+
let path = http::uri::PathAndQuery::from_static("/v1.Signer/SignBeaconProposal");
708632
let mut req = request.into_request();
709-
req.extensions_mut()
710-
.insert(GrpcMethod::new("v1.Signer", "SignBeaconProposal"));
633+
req.extensions_mut().insert(GrpcMethod::new("v1.Signer", "SignBeaconProposal"));
711634
self.inner.unary(req, path, codec).await
712635
}
713636
}

0 commit comments

Comments
 (0)