From b03b2352cff022e52f5c91f5302513b5dec97f65 Mon Sep 17 00:00:00 2001 From: ghassmo Date: Wed, 27 Oct 2021 11:49:04 +0300 Subject: [PATCH] sol: clean up and fix error types --- src/service/sol.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/service/sol.rs b/src/service/sol.rs index fde4336d7..00d22eea5 100644 --- a/src/service/sol.rs +++ b/src/service/sol.rs @@ -633,7 +633,6 @@ pub enum SolFailed { MintIsNotValid(String), JsonError(String), ParseError(String), - SolError(String), } impl std::error::Error for SolFailed {} @@ -677,9 +676,6 @@ impl std::fmt::Display for SolFailed { SolFailed::JsonError(i) => { write!(f, "JsonError: {}", i) } - SolFailed::SolError(i) => { - write!(f, "SolFailed: {}", i) - } } } } @@ -698,7 +694,7 @@ impl From for SolFailed { impl From for SolFailed { fn from(err: solana_client::client_error::ClientError) -> SolFailed { - SolFailed::SolError(err.to_string()) + SolFailed::SolClientError(err.to_string()) } } @@ -710,7 +706,7 @@ impl From for SolFailed { impl From for SolFailed { fn from(err: crate::error::Error) -> SolFailed { - SolFailed::SolError(err.to_string()) + SolFailed::SolClientError(err.to_string()) } } impl From for SolFailed {