fix(compilation warns): no-default-features (#10346)

openethereum · Feb 14, 2019 · 9cce6a4 · 9cce6a4
1 parent bff0bed
commit 9cce6a4
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 3 deletions.
diff --git a/parity/account.rs b/parity/account.rs
@@ -58,7 +58,7 @@ pub struct ImportFromGethAccounts {
 
 
 #[cfg(not(feature = "accounts"))]
-pub fn execute(cmd: AccountCmd) -> Result<String, String> {
+pub fn execute(_cmd: AccountCmd) -> Result<String, String> {
  Err("Account management is deprecated. Please see #9997 for alternatives:\nhttps://github.com/paritytech/parity-ethereum/issues/9997".into())
 }
 

diff --git a/parity/account_utils.rs b/parity/account_utils.rs
@@ -30,12 +30,12 @@ mod accounts {
  pub struct AccountProvider;
 
  impl ::ethcore::miner::LocalAccounts for AccountProvider {
- fn is_local(&self, address: &Address) -> bool {
+ fn is_local(&self, _address: &Address) -> bool {
  false
  }
  }
 
- pub fn prepare_account_provider(_spec: &SpecType, _dirs: &Directories, _data_dir: &str, cfg: AccountsConfig, _passwords: &[Password]) -> Result<AccountProvider, String> {
+ pub fn prepare_account_provider(_spec: &SpecType, _dirs: &Directories, _data_dir: &str, _cfg: AccountsConfig, _passwords: &[Password]) -> Result<AccountProvider, String> {
  warn!("Note: Your instance of Parity Ethereum is running without account support. Some CLI options are ignored.");
  Ok(AccountProvider)
  }

diff --git a/parity/upgrade.rs b/parity/upgrade.rs
@@ -139,6 +139,7 @@ fn file_exists(path: &Path) -> bool {
  }
 }
 
+#[cfg(any(test, feature = "accounts"))]
 pub fn upgrade_key_location(from: &PathBuf, to: &PathBuf) {
  match fs::create_dir_all(&to).and_then(|()| fs::read_dir(from)) {
  Ok(entries) => {

diff --git a/rpc/src/v1/helpers/dispatch/mod.rs b/rpc/src/v1/helpers/dispatch/mod.rs
@@ -201,6 +201,7 @@ pub enum SignWith {
 }
 
 impl SignWith {
+ #[cfg(any(test, feature = "accounts"))]
  fn is_password(&self) -> bool {
  if let SignWith::Password(_) = *self {
  true

diff --git a/rpc/src/v1/helpers/errors.rs b/rpc/src/v1/helpers/errors.rs
@@ -43,7 +43,9 @@ mod codes {
  pub const EXECUTION_ERROR: i64 = -32015;
  pub const EXCEPTION_ERROR: i64 = -32016;
  pub const DATABASE_ERROR: i64 = -32017;
+ #[cfg(any(test, feature = "accounts"))]
  pub const ACCOUNT_LOCKED: i64 = -32020;
+ #[cfg(any(test, feature = "accounts"))]
  pub const PASSWORD_INVALID: i64 = -32021;
  pub const ACCOUNT_ERROR: i64 = -32023;
  pub const PRIVATE_ERROR: i64 = -32024;
@@ -336,6 +338,7 @@ pub fn fetch<T: fmt::Debug>(error: T) -> Error {
  }
 }
 
+#[cfg(any(test, feature = "accounts"))]
 pub fn invalid_call_data<T: fmt::Display>(error: T) -> Error {
  Error {
  code: ErrorCode::ServerError(codes::ENCODING_ERROR),

diff --git a/rpc/src/v1/helpers/mod.rs b/rpc/src/v1/helpers/mod.rs
@@ -20,6 +20,7 @@ pub mod errors;
 pub mod block_import;
 pub mod deprecated;
 pub mod dispatch;
+#[cfg(any(test, feature = "accounts"))]
 pub mod eip191;
 #[cfg(any(test, feature = "accounts"))]
 pub mod engine_signer;
@@ -28,6 +29,7 @@ pub mod fake_sign;
 pub mod ipfs;
 pub mod light_fetch;
 pub mod nonce;
+#[cfg(any(test, feature = "accounts"))]
 pub mod secretstore;
 
 mod network_settings;

diff --git a/rpc/src/v1/types/derivation.rs b/rpc/src/v1/types/derivation.rs
@@ -70,13 +70,15 @@ impl From<DeriveHash> for Derive {
 }
 
 /// Error converting request data
+#[cfg(any(test, feature = "accounts"))]
 #[derive(Debug)]
 pub enum ConvertError {
  IndexOverlfow(u64),
 }
 
 impl Derive {
  /// Convert to account provider struct dealing with possible overflows
+ #[cfg(any(test, feature = "accounts"))]
  pub fn to_derivation(self) -> Result<ethstore::Derivation, ConvertError> {
  Ok(match self {
  Derive::Hierarchical(drv) => {