diff --git a/node/rpc/src/lib.rs b/node/rpc/src/lib.rs index c34f0a2..f4fe395 100644 --- a/node/rpc/src/lib.rs +++ b/node/rpc/src/lib.rs @@ -15,7 +15,7 @@ mod zgs_grpc; use crate::miner::RpcServer as MinerRpcServer; use crate::types::SegmentWithProof; -use crate::zgs_grpc::zgs_grpc::ZgsGrpcServiceImpl; +use crate::zgs_grpc::r#impl::ZgsGrpcServiceImpl; use crate::zgs_grpc_proto::zgs_grpc_service_server::ZgsGrpcServiceServer; use admin::RpcServer as AdminRpcServer; use chunk_pool::MemoryChunkPool; diff --git a/node/rpc/src/types.rs b/node/rpc/src/types.rs index 59a2755..e60796a 100644 --- a/node/rpc/src/types.rs +++ b/node/rpc/src/types.rs @@ -129,13 +129,13 @@ impl TryFrom for SegmentWithProof { type Error = GrpcStatus; fn try_from(grpc_segment: zgs_grpc_proto::SegmentWithProof) -> Result { - let root = grpc_segment.root.unwrap().try_into().map_err(|e| e)?; + let root = grpc_segment.root.unwrap().try_into()?; let data = grpc_segment.data; // index is u64 in proto, usize in app let index = grpc_segment.index.try_into().map_err(|_| { GrpcStatus::invalid_argument(format!("Invalid segment index: {}", grpc_segment.index)) })?; - let proof = grpc_segment.proof.unwrap().try_into().map_err(|e| e)?; + let proof = grpc_segment.proof.unwrap().try_into()?; let file_size = grpc_segment.file_size.try_into().map_err(|_| { GrpcStatus::invalid_argument(format!("Invalid file size: {}", grpc_segment.file_size)) })?; diff --git a/node/rpc/src/zgs/impl.rs b/node/rpc/src/zgs/impl.rs index eb48d33..d1440a5 100644 --- a/node/rpc/src/zgs/impl.rs +++ b/node/rpc/src/zgs/impl.rs @@ -75,8 +75,7 @@ impl RpcServer for RpcServerImpl { let maybe_tx = self.ctx.log_store.get_tx_by_seq_number(tx_seq).await?; for segment in segments.into_iter() { - match rpc_helper::put_segment_with_maybe_tx(&self.ctx, segment, maybe_tx.clone()) - .await + match rpc_helper::put_segment_with_maybe_tx(&self.ctx, segment, maybe_tx.clone()).await { Ok(()) => {} // success Err(e) diff --git a/node/rpc/src/zgs_grpc/zgs_grpc.rs b/node/rpc/src/zgs_grpc/impl.rs similarity index 100% rename from node/rpc/src/zgs_grpc/zgs_grpc.rs rename to node/rpc/src/zgs_grpc/impl.rs diff --git a/node/rpc/src/zgs_grpc/mod.rs b/node/rpc/src/zgs_grpc/mod.rs index 80285de..227743b 100644 --- a/node/rpc/src/zgs_grpc/mod.rs +++ b/node/rpc/src/zgs_grpc/mod.rs @@ -1 +1 @@ -pub mod zgs_grpc; +pub mod r#impl;