grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Have space between feature cfg flag (#8791)

Browse Source
This commit is contained in:
Wei Tang 2018-06-05 17:28:35 +08:00 committed by Niklas Adolfsson
parent b3ea766bd5
commit 6ecc63002b
7 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dapps/js-glue/src/js.rs
View File

@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
#![cfg_attr(feature="use-precompiled-js", allow(dead_code))] #![cfg_attr(feature = "use-precompiled-js", allow(dead_code))]
#![cfg_attr(feature="use-precompiled-js", allow(unused_imports))] #![cfg_attr(feature = "use-precompiled-js", allow(unused_imports))]
use std::fmt; use std::fmt;
use std::process::Command; use std::process::Command;

2
ethcore/evm/src/lib.rs
View File

@ -43,7 +43,7 @@ mod instructions;
#[cfg(test)] #[cfg(test)]
mod tests; mod tests;
#[cfg(all(feature="benches", test))] #[cfg(all(feature = "benches", test))]
mod benches; mod benches;
pub use vm::{ pub use vm::{

8
ethcore/src/client/mod.rs
View File

@ -20,20 +20,20 @@ mod ancient_import;
mod client; mod client;
mod config; mod config;
mod error; mod error;
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
mod evm_test_client; mod evm_test_client;
mod io_message; mod io_message;
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
mod test_client; mod test_client;
mod trace; mod trace;
pub use self::client::*; pub use self::client::*;
pub use self::config::{Mode, ClientConfig, DatabaseCompactionProfile, BlockChainConfig, VMType}; pub use self::config::{Mode, ClientConfig, DatabaseCompactionProfile, BlockChainConfig, VMType};
pub use self::error::Error; pub use self::error::Error;
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
pub use self::evm_test_client::{EvmTestClient, EvmTestError, TransactResult}; pub use self::evm_test_client::{EvmTestClient, EvmTestError, TransactResult};
pub use self::io_message::ClientIoMessage; pub use self::io_message::ClientIoMessage;
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
pub use self::test_client::{TestBlockChainClient, EachBlockWith}; pub use self::test_client::{TestBlockChainClient, EachBlockWith};
pub use self::chain_notify::{ChainNotify, ChainRoute, ChainRouteType, ChainMessageType}; pub use self::chain_notify::{ChainNotify, ChainRoute, ChainRouteType, ChainMessageType};
pub use self::traits::{ pub use self::traits::{

6
ethcore/src/lib.rs
View File

@ -15,7 +15,7 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
#![warn(missing_docs)] #![warn(missing_docs)]
#![cfg_attr(feature="benches", feature(test))] #![cfg_attr(feature = "benches", feature(test))]
//! Ethcore library //! Ethcore library
//! //!
@ -173,9 +173,9 @@ mod tx_filter;
#[cfg(test)] #[cfg(test)]
mod tests; mod tests;
#[cfg(test)] #[cfg(test)]
#[cfg(feature="json-tests")] #[cfg(feature = "json-tests")]
mod json_tests; mod json_tests;
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
pub mod test_helpers; pub mod test_helpers;
#[cfg(test)] #[cfg(test)]
mod test_helpers_internal; mod test_helpers_internal;

26
ethcore/src/spec/spec.rs
View File

@ -515,7 +515,7 @@ macro_rules! load_bundled {
}; };
} }
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
macro_rules! load_machine_bundled { macro_rules! load_machine_bundled {
($e:expr) => { ($e:expr) => {
Spec::load_machine( Spec::load_machine(
@ -847,28 +847,28 @@ impl Spec {
/// Create a new Spec which conforms to the Frontier-era Morden chain except that it's a /// Create a new Spec which conforms to the Frontier-era Morden chain except that it's a
/// NullEngine consensus. /// NullEngine consensus.
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
pub fn new_test() -> Spec { pub fn new_test() -> Spec {
load_bundled!("null_morden") load_bundled!("null_morden")
} }
/// Create the EthereumMachine corresponding to Spec::new_test. /// Create the EthereumMachine corresponding to Spec::new_test.
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
pub fn new_test_machine() -> EthereumMachine { load_machine_bundled!("null_morden") } pub fn new_test_machine() -> EthereumMachine { load_machine_bundled!("null_morden") }
/// Create a new Spec which conforms to the Frontier-era Morden chain except that it's a NullEngine consensus with applying reward on block close. /// Create a new Spec which conforms to the Frontier-era Morden chain except that it's a NullEngine consensus with applying reward on block close.
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
pub fn new_test_with_reward() -> Spec { load_bundled!("null_morden_with_reward") } pub fn new_test_with_reward() -> Spec { load_bundled!("null_morden_with_reward") }
/// Create a new Spec which is a NullEngine consensus with a premine of address whose /// Create a new Spec which is a NullEngine consensus with a premine of address whose
/// secret is keccak(''). /// secret is keccak('').
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
pub fn new_null() -> Spec { pub fn new_null() -> Spec {
load_bundled!("null") load_bundled!("null")
} }
/// Create a new Spec which constructs a contract at address 5 with storage at 0 equal to 1. /// Create a new Spec which constructs a contract at address 5 with storage at 0 equal to 1.
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
pub fn new_test_constructor() -> Spec { pub fn new_test_constructor() -> Spec {
load_bundled!("constructor") load_bundled!("constructor")
} }
@ -876,7 +876,7 @@ impl Spec {
/// Create a new Spec with AuthorityRound consensus which does internal sealing (not /// Create a new Spec with AuthorityRound consensus which does internal sealing (not
/// requiring work). /// requiring work).
/// Accounts with secrets keccak("0") and keccak("1") are the validators. /// Accounts with secrets keccak("0") and keccak("1") are the validators.
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
pub fn new_test_round() -> Self { pub fn new_test_round() -> Self {
load_bundled!("authority_round") load_bundled!("authority_round")
} }
@ -884,7 +884,7 @@ impl Spec {
/// Create a new Spec with AuthorityRound consensus which does internal sealing (not /// Create a new Spec with AuthorityRound consensus which does internal sealing (not
/// requiring work) with empty step messages enabled. /// requiring work) with empty step messages enabled.
/// Accounts with secrets keccak("0") and keccak("1") are the validators. /// Accounts with secrets keccak("0") and keccak("1") are the validators.
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
pub fn new_test_round_empty_steps() -> Self { pub fn new_test_round_empty_steps() -> Self {
load_bundled!("authority_round_empty_steps") load_bundled!("authority_round_empty_steps")
} }
@ -892,7 +892,7 @@ impl Spec {
/// Create a new Spec with AuthorityRound consensus (with empty steps) using a block reward /// Create a new Spec with AuthorityRound consensus (with empty steps) using a block reward
/// contract. The contract source code can be found at: /// contract. The contract source code can be found at:
/// https://github.com/parity-contracts/block-reward/blob/daf7d44383b6cdb11cb6b953b018648e2b027cfb/contracts/ExampleBlockReward.sol /// https://github.com/parity-contracts/block-reward/blob/daf7d44383b6cdb11cb6b953b018648e2b027cfb/contracts/ExampleBlockReward.sol
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
pub fn new_test_round_block_reward_contract() -> Self { pub fn new_test_round_block_reward_contract() -> Self {
load_bundled!("authority_round_block_reward_contract") load_bundled!("authority_round_block_reward_contract")
} }
@ -900,7 +900,7 @@ impl Spec {
/// Create a new Spec with Tendermint consensus which does internal sealing (not requiring /// Create a new Spec with Tendermint consensus which does internal sealing (not requiring
/// work). /// work).
/// Account keccak("0") and keccak("1") are a authorities. /// Account keccak("0") and keccak("1") are a authorities.
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
pub fn new_test_tendermint() -> Self { pub fn new_test_tendermint() -> Self {
load_bundled!("tendermint") load_bundled!("tendermint")
} }
@ -913,7 +913,7 @@ impl Spec {
/// "0xbfc708a000000000000000000000000082a978b3f5962a5b0957d9ee9eef472ee55b42f1" and added /// "0xbfc708a000000000000000000000000082a978b3f5962a5b0957d9ee9eef472ee55b42f1" and added
/// back in using /// back in using
/// "0x4d238c8e00000000000000000000000082a978b3f5962a5b0957d9ee9eef472ee55b42f1". /// "0x4d238c8e00000000000000000000000082a978b3f5962a5b0957d9ee9eef472ee55b42f1".
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
pub fn new_validator_safe_contract() -> Self { pub fn new_validator_safe_contract() -> Self {
load_bundled!("validator_safe_contract") load_bundled!("validator_safe_contract")
} }
@ -921,7 +921,7 @@ impl Spec {
/// The same as the `safeContract`, but allows reporting and uses AuthorityRound. /// The same as the `safeContract`, but allows reporting and uses AuthorityRound.
/// Account is marked with `reportBenign` it can be checked as disliked with "0xd8f2e0bf". /// Account is marked with `reportBenign` it can be checked as disliked with "0xd8f2e0bf".
/// Validator can be removed with `reportMalicious`. /// Validator can be removed with `reportMalicious`.
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
pub fn new_validator_contract() -> Self { pub fn new_validator_contract() -> Self {
load_bundled!("validator_contract") load_bundled!("validator_contract")
} }
@ -930,7 +930,7 @@ impl Spec {
/// height. /// height.
/// Account with secrets keccak("0") is the validator for block 1 and with keccak("1") /// Account with secrets keccak("0") is the validator for block 1 and with keccak("1")
/// onwards. /// onwards.
#[cfg(any(test, feature="test-helpers"))] #[cfg(any(test, feature = "test-helpers"))]
pub fn new_validator_multi() -> Self { pub fn new_validator_multi() -> Self {
load_bundled!("validator_multi") load_bundled!("validator_multi")
} }

2
parity/lib.rs
View File

@ -76,7 +76,7 @@ extern crate registrar;
#[macro_use] #[macro_use]
extern crate log as rlog; extern crate log as rlog;
#[cfg(feature="secretstore")] #[cfg(feature = "secretstore")]
extern crate ethcore_secretstore; extern crate ethcore_secretstore;
#[cfg(feature = "dapps")] #[cfg(feature = "dapps")]

2
parity/secretstore.rs
View File

@ -111,7 +111,7 @@ mod server {
} }
} }
#[cfg(feature="secretstore")] #[cfg(feature = "secretstore")]
mod server { mod server {
use std::sync::Arc; use std::sync::Arc;
use ethcore_secretstore; use ethcore_secretstore;