Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Add deprecation warnings #11682

Merged
merged 4 commits into from
May 11, 2020
Merged
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions parity/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ use types::{
use parity_rpc::{
Origin, Metadata, NetworkSettings, informant, PubSubSession, FutureResult, FutureResponse, FutureOutput
};
use updater::{UpdatePolicy, Updater};
use updater::{UpdateFilter, UpdatePolicy, Updater};
use parity_version::version;
use ethcore_private_tx::{ProviderConfig, EncryptorConfig, SecretStoreEncryptor};
use params::{
Expand Down Expand Up @@ -639,10 +639,14 @@ fn execute_impl<Cr, Rr>(
.map_err(|e| format!("Stratum start error: {:?}", e))?;
}

let (private_tx_sync, private_state) = match cmd.private_tx_enabled {
true => (Some(private_tx_service.clone() as Arc<dyn PrivateTxHandler>), Some(private_tx_provider.private_state_db())),
false => (None, None),
};
let mut private_tx_sync = None;
let mut private_state = None;

if cmd.private_tx_enabled {
warn!("Private transactions support is deprecated and may be removed in a future release.");
private_tx_sync = Some(private_tx_service.clone() as Arc<dyn PrivateTxHandler>);
private_state = Some(private_tx_provider.private_state_db());
}

// create sync object
let (sync_provider, manage_network, chain_notify, priority_tasks) = modules::sync(
Expand Down Expand Up @@ -699,6 +703,10 @@ fn execute_impl<Cr, Rr>(
);

// the updater service
if update_policy.filter != UpdateFilter::None {
warn!("Updater is deprecated and may be removed in a future release.");
}

let updater = Updater::new(
&Arc::downgrade(&(service.client() as Arc<dyn BlockChainClient>)),
&Arc::downgrade(&sync_provider),
Expand Down Expand Up @@ -925,6 +933,7 @@ pub fn execute<Cr, Rr>(
Rr: Fn() + 'static + Send
{
if cmd.light {
warn!("Light client is deprecated and may be removed in a future release. Please see #11681 for details:\nhttps://github.com/openethereum/openethereum/issues/11681");
execute_light_impl(cmd, logger, on_client_rq)
} else {
execute_impl(cmd, logger, on_client_rq, on_updater_rq)
Expand Down