diff --git a/ethcore/src/client/mod.rs b/ethcore/src/client/mod.rs
index 51b4f53db..973321fdb 100644
--- a/ethcore/src/client/mod.rs
+++ b/ethcore/src/client/mod.rs
@@ -51,10 +51,8 @@ pub use types::call_analytics::CallAnalytics;
pub use executive::{Executed, Executive, TransactOptions};
pub use vm::{LastHashes, EnvInfo};
-pub use error::TransactionImportError;
pub use verification::VerifierType;
mod traits;
mod chain_notify;
-mod private_notify;
diff --git a/ethcore/src/client/private_notify.rs b/ethcore/src/client/private_notify.rs
deleted file mode 100644
index 4be183873..000000000
--- a/ethcore/src/client/private_notify.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum. If not, see .
-
-use error::TransactionImportError;
-
-/// Represent private transactions handler inside the client
-pub trait PrivateNotify : Send + Sync {
- /// fires when private transaction message queued via client io queue
- fn private_transaction_queued(&self) -> Result<(), TransactionImportError>;
-}
diff --git a/ethcore/src/error.rs b/ethcore/src/error.rs
index 477f67b26..198d294c1 100644
--- a/ethcore/src/error.rs
+++ b/ethcore/src/error.rs
@@ -186,24 +186,6 @@ pub enum ImportError {
impl error::Error for ImportError {}
-/// Api-level error for transaction import
-#[derive(Debug, Clone)]
-pub enum TransactionImportError {
- /// Transaction error
- Transaction(TransactionError),
- /// Other error
- Other(String),
-}
-
-impl From for TransactionImportError {
- fn from(e: Error) -> Self {
- match e {
- Error::Transaction(transaction_error) => TransactionImportError::Transaction(transaction_error),
- _ => TransactionImportError::Other(format!("other block import error: {:?}", e)),
- }
- }
-}
-
/// Ethcore Result
pub type EthcoreResult = Result;
@@ -255,9 +237,6 @@ pub enum Error {
/// The value of the nonce or mishash is invalid.
#[display(fmt = "The value of the nonce or mishash is invalid.")]
PowInvalid,
- /// Unknown engine given
- #[display(fmt = "Unknown engine name ({})", _0)]
- UnknownEngineName(String),
/// A convenient variant for String.
#[display(fmt = "{}", _0)]
Msg(String),
@@ -282,12 +261,6 @@ impl error::Error for Error {
}
}
-impl From for Error {
- fn from(s: String) -> Self {
- Error::Msg(s)
- }
-}
-
impl From<&str> for Error {
fn from(s: &str) -> Self {
Error::Msg(s.into())