Cleanup build warnings (#87)
* minor cleanup - unused imports * cleanup build warnings - unused vars * make structs pub to get rid of the private_in_public lint warning * missing docs on RangeProof * add missing docs to store delete function * cleaned up deprecation warning - tokio_core -> tokio_io complete() -> send()
This commit is contained in:
committed by
Ignotus Peverell
parent
131ea2f799
commit
3b4a48b2fd
+9
-10
@@ -21,11 +21,10 @@
|
||||
// }
|
||||
// }
|
||||
|
||||
use std::sync::{Arc, Mutex, RwLock};
|
||||
use std::sync::{Arc, RwLock};
|
||||
use std::thread;
|
||||
|
||||
use core::core::{Transaction, Output};
|
||||
use core::core::hash::Hash;
|
||||
use core::ser;
|
||||
use chain::{self, Tip};
|
||||
use pool;
|
||||
@@ -51,7 +50,7 @@ impl ApiEndpoint for ChainApi {
|
||||
vec![Operation::Get]
|
||||
}
|
||||
|
||||
fn get(&self, id: String) -> ApiResult<Tip> {
|
||||
fn get(&self, _: String) -> ApiResult<Tip> {
|
||||
self.chain.head().map_err(|e| Error::Internal(format!("{:?}", e)))
|
||||
}
|
||||
}
|
||||
@@ -75,13 +74,13 @@ impl ApiEndpoint for OutputApi {
|
||||
|
||||
fn get(&self, id: String) -> ApiResult<Output> {
|
||||
debug!("GET output {}", id);
|
||||
let c = util::from_hex(id.clone()).map_err(|e| Error::Argument(format!("Not a valid commitment: {}", id)))?;
|
||||
let c = util::from_hex(id.clone()).map_err(|_| Error::Argument(format!("Not a valid commitment: {}", id)))?;
|
||||
|
||||
match self.chain.get_unspent(&Commitment::from_vec(c)) {
|
||||
Some(utxo) => Ok(utxo),
|
||||
None => Err(Error::NotFound),
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,7 +92,7 @@ pub struct PoolApi<T> {
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct PoolInfo {
|
||||
pub struct PoolInfo {
|
||||
pool_size: usize,
|
||||
orphans_size: usize,
|
||||
total_size: usize,
|
||||
@@ -111,7 +110,7 @@ impl<T> ApiEndpoint for PoolApi<T>
|
||||
vec![Operation::Get, Operation::Custom("push".to_string())]
|
||||
}
|
||||
|
||||
fn get(&self, id: String) -> ApiResult<PoolInfo> {
|
||||
fn get(&self, _: String) -> ApiResult<PoolInfo> {
|
||||
let pool = self.tx_pool.read().unwrap();
|
||||
Ok(PoolInfo {
|
||||
pool_size: pool.pool_size(),
|
||||
@@ -120,9 +119,9 @@ impl<T> ApiEndpoint for PoolApi<T>
|
||||
})
|
||||
}
|
||||
|
||||
fn operation(&self, op: String, input: TxWrapper) -> ApiResult<()> {
|
||||
fn operation(&self, _: String, input: TxWrapper) -> ApiResult<()> {
|
||||
let tx_bin = util::from_hex(input.tx_hex)
|
||||
.map_err(|e| Error::Argument(format!("Invalid hex in transaction wrapper.")))?;
|
||||
.map_err(|_| Error::Argument(format!("Invalid hex in transaction wrapper.")))?;
|
||||
|
||||
let tx: Transaction = ser::deserialize(&mut &tx_bin[..]).map_err(|_| {
|
||||
Error::Argument("Could not deserialize transaction, invalid format.".to_string())
|
||||
@@ -146,7 +145,7 @@ impl<T> ApiEndpoint for PoolApi<T>
|
||||
|
||||
/// Dummy wrapper for the hex-encoded serialized transaction.
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct TxWrapper {
|
||||
pub struct TxWrapper {
|
||||
tx_hex: String,
|
||||
}
|
||||
|
||||
|
||||
+1
-3
@@ -30,9 +30,8 @@ use iron::{Iron, Request, Response, IronResult, IronError, status, headers, List
|
||||
use iron::method::Method;
|
||||
use iron::modifiers::Header;
|
||||
use iron::middleware::Handler;
|
||||
use iron::error::HttpResult;
|
||||
use router::Router;
|
||||
use serde::{Serialize, Deserialize};
|
||||
use serde::Serialize;
|
||||
use serde::de::DeserializeOwned;
|
||||
use serde_json;
|
||||
|
||||
@@ -331,7 +330,6 @@ impl ApiServer {
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use super::*;
|
||||
use rest::*;
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
pub struct Animal {
|
||||
|
||||
Reference in New Issue
Block a user