Remove uses of Error::description() use Display instead (#2887)

* Remove all uses of Error::description() - use Display instead
This commit is contained in:
mattrutherford
2019-06-17 22:04:29 +01:00
committed by GitHub
parent 57f8e9ccb1
commit 7eb2ff760a
3 changed files with 10 additions and 14 deletions
+1 -1
View File
@@ -190,7 +190,7 @@ pub fn block_id_to_lookup_key<Block>(
/// Maps database error to client error /// Maps database error to client error
pub fn db_err(err: io::Error) -> client::error::Error { pub fn db_err(err: io::Error) -> client::error::Error {
use std::error::Error; use std::error::Error;
client::error::Error::Backend(err.description().into()) client::error::Error::Backend(format!("{}", err))
} }
/// Open RocksDB database. /// Open RocksDB database.
+2 -2
View File
@@ -33,7 +33,7 @@ pub enum Error {
/// Transaction pool error, /// Transaction pool error,
Pool(txpool::error::Error), Pool(txpool::error::Error),
/// Verification error /// Verification error
#[display(fmt="Extrinsic verification error: {}", "_0.description()")] #[display(fmt="Extrinsic verification error: {}", _0)]
Verification(Box<dyn std::error::Error + Send>), Verification(Box<dyn std::error::Error + Send>),
/// Incorrect extrinsic format. /// Incorrect extrinsic format.
#[display(fmt="Invalid extrinsic format")] #[display(fmt="Invalid extrinsic format")]
@@ -85,7 +85,7 @@ impl From<Error> for rpc::Error {
}, },
Error::Verification(e) => rpc::Error { Error::Verification(e) => rpc::Error {
code: rpc::ErrorCode::ServerError(VERIFICATION_ERROR), code: rpc::ErrorCode::ServerError(VERIFICATION_ERROR),
message: e.description().into(), message: format!("Verification Error: {}", e).into(),
data: Some(format!("{:?}", e).into()), data: Some(format!("{:?}", e).into()),
}, },
Error::Pool(PoolError::InvalidTransaction(code)) => rpc::Error { Error::Pool(PoolError::InvalidTransaction(code)) => rpc::Error {
+7 -11
View File
@@ -37,21 +37,17 @@ pub enum Error<E> {
impl<E: std::error::Error> fmt::Display for Error<E> { impl<E: std::error::Error> fmt::Display for Error<E> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
use std::error::Error; let message = match *self {
write!(f, "{}", self.description()) Error::Duplicate => "Hash already exists in Tree".into(),
Error::UnfinalizedAncestor => "Finalized descendent of Tree node without finalizing its ancestor(s) first".into(),
Error::Revert => "Tried to import or finalize node that is an ancestor of a previously finalized node".into(),
Error::Client(ref err) => format!("Client error: {}", err),
};
write!(f, "{}", message)
} }
} }
impl<E: std::error::Error> std::error::Error for Error<E> { impl<E: std::error::Error> std::error::Error for Error<E> {
fn description(&self) -> &str {
match *self {
Error::Duplicate => "Hash already exists in Tree",
Error::UnfinalizedAncestor => "Finalized descendent of Tree node without finalizing its ancestor(s) first",
Error::Revert => "Tried to import or finalize node that is an ancestor of a previously finalized node",
Error::Client(ref err) => err.description(),
}
}
fn cause(&self) -> Option<&dyn std::error::Error> { fn cause(&self) -> Option<&dyn std::error::Error> {
None None
} }