Skip to content

Commit 68f2168

Browse files
committed
fix lint
1 parent 75b05c3 commit 68f2168

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

node/rpc/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ mod zgs_grpc;
1515

1616
use crate::miner::RpcServer as MinerRpcServer;
1717
use crate::types::SegmentWithProof;
18-
use crate::zgs_grpc::zgs_grpc::ZgsGrpcServiceImpl;
18+
use crate::zgs_grpc::r#impl::ZgsGrpcServiceImpl;
1919
use crate::zgs_grpc_proto::zgs_grpc_service_server::ZgsGrpcServiceServer;
2020
use admin::RpcServer as AdminRpcServer;
2121
use chunk_pool::MemoryChunkPool;

node/rpc/src/types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,13 @@ impl TryFrom<zgs_grpc_proto::SegmentWithProof> for SegmentWithProof {
129129
type Error = GrpcStatus;
130130

131131
fn try_from(grpc_segment: zgs_grpc_proto::SegmentWithProof) -> Result<Self, GrpcStatus> {
132-
let root = grpc_segment.root.unwrap().try_into().map_err(|e| e)?;
132+
let root = grpc_segment.root.unwrap().try_into()?;
133133
let data = grpc_segment.data;
134134
// index is u64 in proto, usize in app
135135
let index = grpc_segment.index.try_into().map_err(|_| {
136136
GrpcStatus::invalid_argument(format!("Invalid segment index: {}", grpc_segment.index))
137137
})?;
138-
let proof = grpc_segment.proof.unwrap().try_into().map_err(|e| e)?;
138+
let proof = grpc_segment.proof.unwrap().try_into()?;
139139
let file_size = grpc_segment.file_size.try_into().map_err(|_| {
140140
GrpcStatus::invalid_argument(format!("Invalid file size: {}", grpc_segment.file_size))
141141
})?;

node/rpc/src/zgs/impl.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ impl RpcServer for RpcServerImpl {
7575

7676
let maybe_tx = self.ctx.log_store.get_tx_by_seq_number(tx_seq).await?;
7777
for segment in segments.into_iter() {
78-
match rpc_helper::put_segment_with_maybe_tx(&self.ctx, segment, maybe_tx.clone())
79-
.await
78+
match rpc_helper::put_segment_with_maybe_tx(&self.ctx, segment, maybe_tx.clone()).await
8079
{
8180
Ok(()) => {} // success
8281
Err(e)

node/rpc/src/zgs_grpc/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pub mod zgs_grpc;
1+
pub mod r#impl;

0 commit comments

Comments
 (0)