From 5fef8a44626df9bfe82dc19d4040ee609719fabe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Garillot?= Date: Sat, 17 Apr 2021 09:40:31 -0700 Subject: [PATCH] Remove a couple unnecessary panics By folding them in the Error case of their encompassing Result Tool-aided by [comby-rust](https://github.com/huitseeker/compby-rust) --- blockchain/message_pool/src/msgpool/test_provider.rs | 2 +- ipld/graphsync/src/libp2p/codec.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blockchain/message_pool/src/msgpool/test_provider.rs b/blockchain/message_pool/src/msgpool/test_provider.rs index abbbb22fa9ab..e8c3f5d4bf42 100644 --- a/blockchain/message_pool/src/msgpool/test_provider.rs +++ b/blockchain/message_pool/src/msgpool/test_provider.rs @@ -150,7 +150,7 @@ impl Provider for TestApi { } fn messages_for_tipset(&self, h: &Tipset) -> Result, Error> { - let (us, s) = self.messages_for_block(&h.blocks()[0]).unwrap(); + let (us, s) = self.messages_for_block(&h.blocks()[0])?; let mut msgs = Vec::new(); for msg in us { diff --git a/ipld/graphsync/src/libp2p/codec.rs b/ipld/graphsync/src/libp2p/codec.rs index e74c916ce060..88bf74b7a702 100644 --- a/ipld/graphsync/src/libp2p/codec.rs +++ b/ipld/graphsync/src/libp2p/codec.rs @@ -20,7 +20,7 @@ impl Encoder for GraphSyncCodec { type Item = GraphSyncMessage; fn encode(&mut self, item: Self::Item, dst: &mut BytesMut) -> Result<(), Self::Error> { - let proto_msg = proto::Message::try_from(item).unwrap(); + let proto_msg = proto::Message::try_from(item)?; let buf: Vec = proto_msg.write_to_bytes()?; self.length_codec.encode(Bytes::from(buf), dst)