Remove CallContract and RegistryInfo re-exports from ethcore/client (#10205)

* Remove re-export of `CallContract` and `RegistryInfo` from `ethcore/client`

* Remove CallContract and RegistryInfo re-exports again

This was missed while fixing merge conflicts
This commit is contained in:
Hernando Castano 2019-01-17 16:43:08 +01:00 committed by GitHub
parent 35bbf11ba5
commit 2a7ed457dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 45 additions and 22 deletions

3
Cargo.lock generated
View File

@ -976,6 +976,7 @@ dependencies = [
"ethabi-contract 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethabi-contract 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethabi-derive 6.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethabi-derive 6.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.12.0", "ethcore 1.12.0",
"ethcore-call-contract 0.1.0",
"ethcore-io 1.12.0", "ethcore-io 1.12.0",
"ethcore-miner 1.12.0", "ethcore-miner 1.12.0",
"ethereum-types 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethereum-types 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1014,6 +1015,7 @@ dependencies = [
"ethabi-contract 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethabi-contract 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethabi-derive 6.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethabi-derive 6.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.12.0", "ethcore 1.12.0",
"ethcore-call-contract 0.1.0",
"ethcore-sync 1.12.0", "ethcore-sync 1.12.0",
"ethereum-types 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethereum-types 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethkey 0.3.0", "ethkey 0.3.0",
@ -2408,6 +2410,7 @@ dependencies = [
"docopt 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "docopt 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.12.0", "ethcore 1.12.0",
"ethcore-blockchain 0.1.0", "ethcore-blockchain 0.1.0",
"ethcore-call-contract 0.1.0",
"ethcore-db 0.1.0", "ethcore-db 0.1.0",
"ethcore-io 1.12.0", "ethcore-io 1.12.0",
"ethcore-light 1.12.0", "ethcore-light 1.12.0",

View File

@ -34,6 +34,7 @@ ethcore = { path = "ethcore", features = ["parity"] }
parity-bytes = "0.1" parity-bytes = "0.1"
common-types = { path = "ethcore/types" } common-types = { path = "ethcore/types" }
ethcore-blockchain = { path = "ethcore/blockchain" } ethcore-blockchain = { path = "ethcore/blockchain" }
ethcore-call-contract = { path = "ethcore/call-contract"}
ethcore-db = { path = "ethcore/db" } ethcore-db = { path = "ethcore/db" }
ethcore-io = { path = "util/io" } ethcore-io = { path = "util/io" }
ethcore-light = { path = "ethcore/light" } ethcore-light = { path = "ethcore/light" }

View File

@ -12,6 +12,7 @@ ethabi = "6.0"
ethabi-contract = "6.0" ethabi-contract = "6.0"
ethabi-derive = "6.0" ethabi-derive = "6.0"
ethcore = { path = ".." } ethcore = { path = ".." }
ethcore-call-contract = { path = "../call-contract" }
ethcore-io = { path = "../../util/io" } ethcore-io = { path = "../../util/io" }
ethcore-miner = { path = "../../miner" } ethcore-miner = { path = "../../miner" }
ethereum-types = "0.4" ethereum-types = "0.4"

View File

@ -28,6 +28,7 @@ mod error;
extern crate common_types as types; extern crate common_types as types;
extern crate ethabi; extern crate ethabi;
extern crate ethcore; extern crate ethcore;
extern crate ethcore_call_contract as call_contract;
extern crate ethcore_io as io; extern crate ethcore_io as io;
extern crate ethcore_miner; extern crate ethcore_miner;
extern crate ethereum_types; extern crate ethereum_types;
@ -82,11 +83,12 @@ use types::transaction::{SignedTransaction, Transaction, Action, UnverifiedTrans
use ethcore::{contract_address as ethcore_contract_address}; use ethcore::{contract_address as ethcore_contract_address};
use ethcore::client::{ use ethcore::client::{
Client, ChainNotify, NewBlocks, ChainMessageType, ClientIoMessage, BlockId, Client, ChainNotify, NewBlocks, ChainMessageType, ClientIoMessage, BlockId,
CallContract, Call, BlockInfo Call, BlockInfo
}; };
use ethcore::account_provider::AccountProvider; use ethcore::account_provider::AccountProvider;
use ethcore::miner::{self, Miner, MinerService, pool_client::NonceCache}; use ethcore::miner::{self, Miner, MinerService, pool_client::NonceCache};
use ethcore::trace::{Tracer, VMTracer}; use ethcore::trace::{Tracer, VMTracer};
use call_contract::CallContract;
use rustc_hex::FromHex; use rustc_hex::FromHex;
use ethkey::Password; use ethkey::Password;
use ethabi::FunctionOutputDecoder; use ethabi::FunctionOutputDecoder;

View File

@ -48,9 +48,6 @@ pub use types::trace_filter::Filter as TraceFilter;
pub use types::pruning_info::PruningInfo; pub use types::pruning_info::PruningInfo;
pub use types::call_analytics::CallAnalytics; pub use types::call_analytics::CallAnalytics;
// TODO: Get rid of re-exports: https://github.com/paritytech/parity-ethereum/issues/10130
pub use call_contract::{CallContract, RegistryInfo};
pub use executive::{Executed, Executive, TransactOptions}; pub use executive::{Executed, Executive, TransactOptions};
pub use vm::{LastHashes, EnvInfo}; pub use vm::{LastHashes, EnvInfo};

View File

@ -145,7 +145,8 @@ mod tests {
use miner::MinerService; use miner::MinerService;
use types::ids::BlockId; use types::ids::BlockId;
use test_helpers::generate_dummy_client_with_spec_and_accounts; use test_helpers::generate_dummy_client_with_spec_and_accounts;
use client::{BlockChainClient, ChainInfo, BlockInfo, CallContract}; use call_contract::CallContract;
use client::{BlockChainClient, ChainInfo, BlockInfo};
use super::super::ValidatorSet; use super::super::ValidatorSet;
use super::ValidatorContract; use super::ValidatorContract;

View File

@ -60,13 +60,13 @@
extern crate ansi_term; extern crate ansi_term;
extern crate bn; extern crate bn;
extern crate byteorder; extern crate byteorder;
extern crate ethcore_call_contract as call_contract;
extern crate common_types as types; extern crate common_types as types;
extern crate crossbeam; extern crate crossbeam;
extern crate ethabi; extern crate ethabi;
extern crate ethash; extern crate ethash;
extern crate ethcore_blockchain as blockchain; extern crate ethcore_blockchain as blockchain;
extern crate ethcore_bloom_journal as bloom_journal; extern crate ethcore_bloom_journal as bloom_journal;
extern crate ethcore_call_contract as call_contract;
extern crate ethcore_db as db; extern crate ethcore_db as db;
extern crate ethcore_io as io; extern crate ethcore_io as io;
extern crate ethcore_miner; extern crate ethcore_miner;

View File

@ -30,7 +30,8 @@ use vm::{EnvInfo, Schedule, CreateContractAddress};
use block::{ExecutedBlock, IsBlock}; use block::{ExecutedBlock, IsBlock};
use builtin::Builtin; use builtin::Builtin;
use client::{BlockInfo, CallContract}; use call_contract::CallContract;
use client::BlockInfo;
use error::Error; use error::Error;
use executive::Executive; use executive::Executive;
use spec::CommonParams; use spec::CommonParams;

View File

@ -21,6 +21,7 @@ use std::sync::Arc;
use ansi_term::Colour; use ansi_term::Colour;
use bytes::Bytes; use bytes::Bytes;
use call_contract::CallContract;
use ethcore_miner::gas_pricer::GasPricer; use ethcore_miner::gas_pricer::GasPricer;
use ethcore_miner::pool::{self, TransactionQueue, VerifiedTransaction, QueueStatus, PrioritizationStrategy}; use ethcore_miner::pool::{self, TransactionQueue, VerifiedTransaction, QueueStatus, PrioritizationStrategy};
#[cfg(feature = "work-notify")] #[cfg(feature = "work-notify")]
@ -48,7 +49,7 @@ use using_queue::{UsingQueue, GetAction};
use account_provider::{AccountProvider, SignError as AccountError}; use account_provider::{AccountProvider, SignError as AccountError};
use block::{ClosedBlock, IsBlock, SealedBlock}; use block::{ClosedBlock, IsBlock, SealedBlock};
use client::{ use client::{
BlockChain, ChainInfo, CallContract, BlockProducer, SealedBlockImporter, Nonce, TransactionInfo, TransactionId BlockChain, ChainInfo, BlockProducer, SealedBlockImporter, Nonce, TransactionInfo, TransactionId
}; };
use client::{BlockId, ClientIoMessage}; use client::{BlockId, ClientIoMessage};
use engines::{EthEngine, Seal}; use engines::{EthEngine, Seal};

View File

@ -42,8 +42,9 @@ use types::header::Header;
use types::receipt::RichReceipt; use types::receipt::RichReceipt;
use block::SealedBlock; use block::SealedBlock;
use call_contract::{CallContract, RegistryInfo};
use client::{ use client::{
CallContract, RegistryInfo, ScheduleInfo, ScheduleInfo,
BlockChain, BlockProducer, SealedBlockImporter, ChainInfo, BlockChain, BlockProducer, SealedBlockImporter, ChainInfo,
AccountData, Nonce, AccountData, Nonce,
}; };

View File

@ -35,7 +35,8 @@ use types::header::Header;
use parking_lot::RwLock; use parking_lot::RwLock;
use account_provider::AccountProvider; use account_provider::AccountProvider;
use client::{TransactionId, BlockInfo, CallContract, Nonce}; use call_contract::CallContract;
use client::{TransactionId, BlockInfo, Nonce};
use engines::EthEngine; use engines::EthEngine;
use miner; use miner;
use transaction_ext::Transaction; use transaction_ext::Transaction;

View File

@ -20,7 +20,8 @@ use ethereum_types::{H256, U256, Address};
use lru_cache::LruCache; use lru_cache::LruCache;
use ethabi::FunctionOutputDecoder; use ethabi::FunctionOutputDecoder;
use client::{BlockInfo, CallContract, BlockId}; use call_contract::CallContract;
use client::{BlockInfo, BlockId};
use parking_lot::Mutex; use parking_lot::Mutex;
use spec::CommonParams; use spec::CommonParams;
use types::transaction::{Action, SignedTransaction}; use types::transaction::{Action, SignedTransaction};

View File

@ -16,7 +16,8 @@
//! Canonical verifier. //! Canonical verifier.
use client::{BlockInfo, CallContract}; use call_contract::CallContract;
use client::BlockInfo;
use engines::EthEngine; use engines::EthEngine;
use error::Error; use error::Error;
use types::header::Header; use types::header::Header;

View File

@ -28,7 +28,8 @@ pub use self::canon_verifier::CanonVerifier;
pub use self::noop_verifier::NoopVerifier; pub use self::noop_verifier::NoopVerifier;
pub use self::queue::{BlockQueue, Config as QueueConfig, VerificationQueue, QueueInfo}; pub use self::queue::{BlockQueue, Config as QueueConfig, VerificationQueue, QueueInfo};
use client::{BlockInfo, CallContract}; use call_contract::CallContract;
use client::BlockInfo;
/// Verifier type. /// Verifier type.
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]

View File

@ -16,7 +16,8 @@
//! No-op verifier. //! No-op verifier.
use client::{BlockInfo, CallContract}; use call_contract::CallContract;
use client::BlockInfo;
use engines::EthEngine; use engines::EthEngine;
use error::Error; use error::Error;
use types::header::Header; use types::header::Header;

View File

@ -32,7 +32,8 @@ use triehash::ordered_trie_root;
use unexpected::{Mismatch, OutOfBounds}; use unexpected::{Mismatch, OutOfBounds};
use blockchain::*; use blockchain::*;
use client::{BlockInfo, CallContract}; use call_contract::CallContract;
use client::BlockInfo;
use engines::EthEngine; use engines::EthEngine;
use error::{BlockError, Error}; use error::{BlockError, Error};
use types::{BlockNumber, header::Header}; use types::{BlockNumber, header::Header};

View File

@ -16,7 +16,8 @@
//! A generic verifier trait. //! A generic verifier trait.
use client::{BlockInfo, CallContract}; use call_contract::CallContract;
use client::BlockInfo;
use engines::EthEngine; use engines::EthEngine;
use error::Error; use error::Error;
use types::header::Header; use types::header::Header;

View File

@ -43,8 +43,9 @@ extern crate toml;
extern crate blooms_db; extern crate blooms_db;
extern crate cli_signer; extern crate cli_signer;
extern crate common_types as types; extern crate common_types as types;
extern crate ethcore;
extern crate parity_bytes as bytes; extern crate parity_bytes as bytes;
extern crate ethcore;
extern crate ethcore_call_contract as call_contract;
extern crate ethcore_db; extern crate ethcore_db;
extern crate ethcore_io as io; extern crate ethcore_io as io;
extern crate ethcore_light as light; extern crate ethcore_light as light;

View File

@ -21,8 +21,9 @@ use std::thread;
use ansi_term::Colour; use ansi_term::Colour;
use bytes::Bytes; use bytes::Bytes;
use call_contract::CallContract;
use ethcore::account_provider::{AccountProvider, AccountProviderSettings}; use ethcore::account_provider::{AccountProvider, AccountProviderSettings};
use ethcore::client::{BlockId, CallContract, Client, Mode, DatabaseCompactionProfile, VMType, BlockChainClient, BlockInfo}; use ethcore::client::{BlockId, Client, Mode, DatabaseCompactionProfile, VMType, BlockChainClient, BlockInfo};
use ethstore::ethkey; use ethstore::ethkey;
use ethcore::miner::{stratum, Miner, MinerService, MinerOptions}; use ethcore::miner::{stratum, Miner, MinerService, MinerOptions};
use ethcore::snapshot::{self, SnapshotConfiguration}; use ethcore::snapshot::{self, SnapshotConfiguration};

View File

@ -8,6 +8,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies] [dependencies]
byteorder = "1.0" byteorder = "1.0"
common-types = { path = "../ethcore/types" } common-types = { path = "../ethcore/types" }
ethcore-call-contract = { path = "../ethcore/call-contract" }
log = "0.4" log = "0.4"
parking_lot = "0.7" parking_lot = "0.7"
hyper = { version = "0.12", default-features = false } hyper = { version = "0.12", default-features = false }

View File

@ -17,7 +17,8 @@
use std::sync::Arc; use std::sync::Arc;
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use parking_lot::{Mutex, RwLock}; use parking_lot::{Mutex, RwLock};
use ethcore::client::{BlockId, ChainNotify, NewBlocks, CallContract}; use call_contract::CallContract;
use ethcore::client::{BlockId, ChainNotify, NewBlocks};
use ethereum_types::Address; use ethereum_types::Address;
use ethabi::FunctionOutputDecoder; use ethabi::FunctionOutputDecoder;
use trusted_client::TrustedClient; use trusted_client::TrustedClient;

View File

@ -18,8 +18,9 @@ use std::sync::Arc;
use std::net::SocketAddr; use std::net::SocketAddr;
use std::collections::{BTreeMap, HashSet}; use std::collections::{BTreeMap, HashSet};
use parking_lot::Mutex; use parking_lot::Mutex;
use call_contract::CallContract;
use ethabi::FunctionOutputDecoder; use ethabi::FunctionOutputDecoder;
use ethcore::client::{Client, BlockChainClient, BlockId, ChainNotify, NewBlocks, CallContract}; use ethcore::client::{Client, BlockChainClient, BlockId, ChainNotify, NewBlocks};
use ethereum_types::{H256, Address}; use ethereum_types::{H256, Address};
use ethkey::public_to_address; use ethkey::public_to_address;
use bytes::Bytes; use bytes::Bytes;

View File

@ -18,6 +18,7 @@ extern crate byteorder;
extern crate common_types; extern crate common_types;
extern crate ethabi; extern crate ethabi;
extern crate ethcore; extern crate ethcore;
extern crate ethcore_call_contract as call_contract;
extern crate ethcore_sync as sync; extern crate ethcore_sync as sync;
extern crate ethereum_types; extern crate ethereum_types;
extern crate ethkey; extern crate ethkey;

View File

@ -19,7 +19,8 @@ use parking_lot::RwLock;
use common_types::filter::Filter; use common_types::filter::Filter;
use ethabi::RawLog; use ethabi::RawLog;
use ethabi::FunctionOutputDecoder; use ethabi::FunctionOutputDecoder;
use ethcore::client::{Client, BlockChainClient, BlockId, CallContract}; use call_contract::CallContract;
use ethcore::client::{Client, BlockChainClient, BlockId};
use ethkey::{Public, public_to_address}; use ethkey::{Public, public_to_address};
use hash::keccak; use hash::keccak;
use bytes::Bytes; use bytes::Bytes;

View File

@ -16,9 +16,10 @@
use std::sync::{Arc, Weak}; use std::sync::{Arc, Weak};
use bytes::Bytes; use bytes::Bytes;
use call_contract::RegistryInfo;
use common_types::transaction::{Transaction, SignedTransaction, Action}; use common_types::transaction::{Transaction, SignedTransaction, Action};
use ethereum_types::Address; use ethereum_types::Address;
use ethcore::client::{Client, BlockChainClient, ChainInfo, Nonce, BlockId, RegistryInfo}; use ethcore::client::{Client, BlockChainClient, ChainInfo, Nonce, BlockId};
use ethcore::miner::{Miner, MinerService}; use ethcore::miner::{Miner, MinerService};
use sync::SyncProvider; use sync::SyncProvider;
use helpers::{get_confirmed_block_hash, REQUEST_CONFIRMATIONS_REQUIRED}; use helpers::{get_confirmed_block_hash, REQUEST_CONFIRMATIONS_REQUIRED};