From 7ca4d45bf5e18b047ba11c1a2b6f615d8fe186b6 Mon Sep 17 00:00:00 2001 From: Antioch Peverell <30642645+antiochp@users.noreply.github.com> Date: Mon, 20 Aug 2018 21:56:32 +0100 Subject: [PATCH] Cleanup build warnings (#1391) * cleanup some unused vars etc. * rustfmt --- chain/src/chain.rs | 6 ++---- p2p/src/protocol.rs | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/chain/src/chain.rs b/chain/src/chain.rs index 3f7d6ee06..08a51ed9e 100644 --- a/chain/src/chain.rs +++ b/chain/src/chain.rs @@ -25,9 +25,7 @@ use lmdb; use core::core::hash::{Hash, Hashed}; use core::core::merkle_proof::MerkleProof; use core::core::target::Difficulty; -use core::core::{ - Block, BlockHeader, Output, OutputFeatures, OutputIdentifier, Transaction, TxKernel, -}; +use core::core::{Block, BlockHeader, Output, OutputIdentifier, Transaction, TxKernel}; use core::global; use error::{Error, ErrorKind}; use grin_store::Error::NotFoundErr; @@ -396,7 +394,7 @@ impl Chain { let res = txhashset.is_unspent(output_ref); match res { Err(e) => Err(e), - Ok((h, p)) => Ok(h), + Ok((h, _)) => Ok(h), } } diff --git a/p2p/src/protocol.rs b/p2p/src/protocol.rs index 0eafabbe0..c1f32c900 100644 --- a/p2p/src/protocol.rs +++ b/p2p/src/protocol.rs @@ -20,7 +20,7 @@ use std::sync::Arc; use conn::{Message, MessageHandler, Response}; use core::core; -use core::core::hash::{Hash, Hashed}; +use core::core::hash::Hash; use msg::{ BanReason, GetPeerAddrs, Headers, Locator, PeerAddrs, Ping, Pong, SockAddr, TxHashSetArchive, TxHashSetRequest, Type, @@ -120,7 +120,6 @@ impl MessageHandler for Protocol { "handle_payload: received block: msg_len: {}", msg.header.msg_len ); let b: core::Block = msg.body()?; - let bh = b.hash(); adapter.block_received(b, self.addr); Ok(None) @@ -161,7 +160,6 @@ impl MessageHandler for Protocol { "handle_payload: received compact block: msg_len: {}", msg.header.msg_len ); let b: core::CompactBlock = msg.body()?; - let bh = b.hash(); adapter.compact_block_received(b, self.addr); Ok(None)