Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 11:31:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2465 from sesam/catchingClippy

Browse source 
Catching clippy
This commit is contained in:
hashmap 2019-01-24 22:00:34 +01:00 committed by GitHub
commit 2e22e2c6ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
api/src/handlers/blocks_api.rs
View file

@ -60,15 +60,15 @@ impl HeaderHandler {
fn get_header_for_output(&self, commit_id: String) -> Result<BlockHeaderPrintable, Error> { fn get_header_for_output(&self, commit_id: String) -> Result<BlockHeaderPrintable, Error> {
let oid = get_output(&self.chain, &commit_id)?.1; let oid = get_output(&self.chain, &commit_id)?.1;
match w(&self.chain).get_header_for_output(&oid) { match w(&self.chain).get_header_for_output(&oid) {
Ok(header) => return Ok(BlockHeaderPrintable::from_header(&header)), Ok(header) => Ok(BlockHeaderPrintable::from_header(&header)),
Err(_) => return Err(ErrorKind::NotFound)?, Err(_) => Err(ErrorKind::NotFound)?,
} }
} }
} }
impl Handler for HeaderHandler { impl Handler for HeaderHandler {
fn get(&self, req: Request<Body>) -> ResponseFuture { fn get(&self, req: Request<Body>) -> ResponseFuture {
let el = match req.uri().path().trim_right_matches("/").rsplit("/").next() { let el = match req.uri().path().trim_right_matches('/').rsplit('/').next() {
None => return response(StatusCode::BAD_REQUEST, "invalid url"), None => return response(StatusCode::BAD_REQUEST, "invalid url"),
Some(el) => el, Some(el) => el,
}; };
@ -125,12 +125,12 @@ fn check_block_param(input: &String) -> Result<(), Error> {
"Not a valid hash or height.".to_owned(), "Not a valid hash or height.".to_owned(),
))?; ))?;
} }
return Ok(()); Ok(())
} }
impl Handler for BlockHandler { impl Handler for BlockHandler {
fn get(&self, req: Request<Body>) -> ResponseFuture { fn get(&self, req: Request<Body>) -> ResponseFuture {
let el = match req.uri().path().trim_right_matches("/").rsplit("/").next() { let el = match req.uri().path().trim_right_matches('/').rsplit('/').next() {
None => return response(StatusCode::BAD_REQUEST, "invalid url"), None => return response(StatusCode::BAD_REQUEST, "invalid url"),
Some(el) => el, Some(el) => el,
}; };

6
api/src/handlers/chain_api.rs
View file

@ -111,7 +111,7 @@ impl OutputHandler {
for (k, id) in params { for (k, id) in params {
if k == "id" { if k == "id" {
for id in id.split(",") { for id in id.split(',') {
commitments.push(id.to_owned()); commitments.push(id.to_owned());
} }
} }
@ -178,7 +178,7 @@ impl OutputHandler {
if let Some(ids) = params.get("id") { if let Some(ids) = params.get("id") {
for id in ids { for id in ids {
for id in id.split(",") { for id in id.split(',') {
if let Ok(x) = util::from_hex(String::from(id)) { if let Ok(x) = util::from_hex(String::from(id)) {
commitments.push(Commitment::from_vec(x)); commitments.push(Commitment::from_vec(x));
} }
@ -223,7 +223,7 @@ impl OutputHandler {
impl Handler for OutputHandler { impl Handler for OutputHandler {
fn get(&self, req: Request<Body>) -> ResponseFuture { fn get(&self, req: Request<Body>) -> ResponseFuture {
let command = match req.uri().path().trim_right_matches("/").rsplit("/").next() { let command = match req.uri().path().trim_right_matches('/').rsplit('/').next() {
Some(c) => c, Some(c) => c,
None => return response(StatusCode::BAD_REQUEST, "invalid url"), None => return response(StatusCode::BAD_REQUEST, "invalid url"),
}; };

4
api/src/handlers/peers_api.rs
View file

@ -56,7 +56,7 @@ pub struct PeerHandler {
impl Handler for PeerHandler { impl Handler for PeerHandler {
fn get(&self, req: Request<Body>) -> ResponseFuture { fn get(&self, req: Request<Body>) -> ResponseFuture {
let command = match req.uri().path().trim_right_matches("/").rsplit("/").next() { let command = match req.uri().path().trim_right_matches('/').rsplit('/').next() {
Some(c) => c, Some(c) => c,
None => return response(StatusCode::BAD_REQUEST, "invalid url"), None => return response(StatusCode::BAD_REQUEST, "invalid url"),
}; };
@ -73,7 +73,7 @@ impl Handler for PeerHandler {
} }
} }
fn post(&self, req: Request<Body>) -> ResponseFuture { fn post(&self, req: Request<Body>) -> ResponseFuture {
let mut path_elems = req.uri().path().trim_right_matches("/").rsplit("/"); let mut path_elems = req.uri().path().trim_right_matches('/').rsplit('/');
let command = match path_elems.next() { let command = match path_elems.next() {
None => return response(StatusCode::BAD_REQUEST, "invalid url"), None => return response(StatusCode::BAD_REQUEST, "invalid url"),
Some(c) => c, Some(c) => c,

2
core/src/consensus.rs
View file

@ -250,7 +250,7 @@ impl HeaderInfo {
/// Move value linearly toward a goal /// Move value linearly toward a goal
pub fn damp(actual: u64, goal: u64, damp_factor: u64) -> u64 { pub fn damp(actual: u64, goal: u64, damp_factor: u64) -> u64 {
(1 * actual + (damp_factor - 1) * goal) / damp_factor (actual + (damp_factor - 1) * goal) / damp_factor
} }
/// limit value to be within some factor from a goal /// limit value to be within some factor from a goal

1
core/src/core/block.rs
View file

@ -418,6 +418,7 @@ impl Block {
/// TODO - Move this somewhere where only tests will use it. /// TODO - Move this somewhere where only tests will use it.
/// *** Only used in tests. *** /// *** Only used in tests. ***
/// ///
#[warn(clippy::new_ret_no_self)]
pub fn new( pub fn new(
prev: &BlockHeader, prev: &BlockHeader,
txs: Vec<Transaction>, txs: Vec<Transaction>,

2
core/src/genesis.rs
View file

@ -17,6 +17,8 @@
// required for genesis replacement // required for genesis replacement
//! #![allow(unused_imports)] //! #![allow(unused_imports)]
#![cfg_attr(feature = "cargo-clippy", allow(clippy::unreadable_literal))]
use chrono::prelude::{TimeZone, Utc}; use chrono::prelude::{TimeZone, Utc};
use crate::core; use crate::core;

8
keychain/src/mnemonic.rs
View file

@ -89,7 +89,7 @@ pub fn to_entropy(mnemonic: &str) -> Result<Vec<u8>, Error> {
for index in indexes.iter().rev() { for index in indexes.iter().rev() {
for i in 0..11 { for i in 0..11 {
let bit = index & (1 << i) != 0; let bit = index & (1 << i) != 0;
entropy[datalen - loc / 8] |= (bit as u8) << loc % 8; entropy[datalen - loc / 8] |= (bit as u8) << (loc % 8);
loc += 1; loc += 1;
} }
} }
@ -99,7 +99,7 @@ pub fn to_entropy(mnemonic: &str) -> Result<Vec<u8>, Error> {
sha2sum.input(&entropy.clone()); sha2sum.input(&entropy.clone());
hash.copy_from_slice(sha2sum.result().as_slice()); hash.copy_from_slice(sha2sum.result().as_slice());
let actual = (hash[0] >> 8 - checksum_bits) & mask; let actual = (hash[0] >> (8 - checksum_bits)) & mask;
if actual != checksum { if actual != checksum {
return Err(Error::BadChecksum(checksum, actual)); return Err(Error::BadChecksum(checksum, actual));
@ -134,13 +134,13 @@ pub fn from_entropy(entropy: &Vec<u8>) -> Result<String, Error> {
for byte in entropy.iter() { for byte in entropy.iter() {
for i in (0..8).rev() { for i in (0..8).rev() {
let bit = byte & (1 << i) != 0; let bit = byte & (1 << i) != 0;
indexes[loc / 11] |= (bit as u16) << 10 - (loc % 11); indexes[loc / 11] |= (bit as u16) << (10 - (loc % 11));
loc += 1; loc += 1;
} }
} }
for i in (0..checksum_bits).rev() { for i in (0..checksum_bits).rev() {
let bit = checksum & (1 << i) != 0; let bit = checksum & (1 << i) != 0;
indexes[loc / 11] |= (bit as u16) << 10 - (loc % 11); indexes[loc / 11] |= (bit as u16) << (10 - (loc % 11));
loc += 1; loc += 1;
} }