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

Remove old deprecated flags, move light client, updater and private tx flags to deprecated section #11694

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
572 changes: 117 additions & 455 deletions parity/cli/mod.rs

Large diffs are not rendered by default.

12 changes: 4 additions & 8 deletions parity/cli/presets/config.mining.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
[network]
# Parity will try to maintain connection to at least 50 peers.
# OpenEthereum will try to maintain connection to at least 50 peers.
min_peers = 50
# Parity will maintain at most 100 peers.
# OpenEthereum will maintain at most 100 peers.
max_peers = 100

[ipc]
# You won't be able to use IPC to interact with Parity.
disable = true

[dapps]
# You won't be able to access any web Dapps.
# You won't be able to use IPC to interact with OpenEthereum.
disable = true

[mining]
Expand All @@ -19,7 +15,7 @@ force_sealing = true
reseal_on_txs = "all"
# New pending block will be created only once per 4000 milliseconds.
reseal_min_period = 4000
# Parity will keep/relay at most 8192 transactions in queue.
# OpenEthereum will keep/relay at most 8192 transactions in queue.
tx_queue_size = 8192
tx_queue_per_sender = 128

Expand Down
2 changes: 1 addition & 1 deletion parity/cli/presets/config.non-standard-ports.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[network]
# Parity will listen for connections on port 30305.
# OpenEthereum will listen for connections on port 30305.
port = 30305

[rpc]
Expand Down
23 changes: 1 addition & 22 deletions parity/cli/tests/config.full.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@ account = "0xdeadbeefcafe0000000000000000000000000000"
sstore_url = "http://localhost:8082"
sstore_threshold = 0

[ui]
force = false
disable = false
port = 8180
interface = "127.0.0.1"
path = "$HOME/.parity/signer"

[network]
port = 30303
min_peers = 25
Expand Down Expand Up @@ -80,16 +73,6 @@ disable = false
path = "$HOME/.parity/jsonrpc.ipc"
apis = ["web3", "eth", "net", "parity", "parity_accounts", "personal", "traces", "rpc", "secretstore"]

[dapps]
disable = false
port = 8080
interface = "local"
hosts = ["none"]
path = "$HOME/.parity/dapps"
# authorization:
user = "test_user"
pass = "test_pass"

[secretstore]
disable = false
disable_http = false
Expand Down Expand Up @@ -132,7 +115,7 @@ tx_gas_limit = "10000000"
tx_time_limit = 100 #ms
tx_queue_no_unfamiliar_locals = false
tx_queue_no_early_reject = false
extra_data = "Parity"
extra_data = "OpenEthereum"
remove_solved = false
notify_work = ["http://localhost:3001"]
refuse_service_transactions = false
Expand Down Expand Up @@ -166,7 +149,3 @@ disable_periodic = false
logging = "own_tx=trace"
log_file = "/var/log/parity.log"
color = true

[whisper]
enabled = false
pool_size = 20
9 changes: 0 additions & 9 deletions parity/cli/tests/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ server_threads = 13
[ipc]
apis = ["rpc", "eth"]

[dapps]
port = 8080
user = "username"
pass = "password"

[secretstore]
http_port = 8082
port = 8083
Expand Down Expand Up @@ -84,7 +79,3 @@ log_file = "/var/log/parity.log"
color = true
ports_shift = 0
unsafe_expose = false

[whisper]
enabled = true
pool_size = 50
2 changes: 1 addition & 1 deletion parity/cli/usage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ macro_rules! usage {
}
)*

let matches = App::new("Parity")
let matches = App::new("OpenEthereum")
.global_setting(AppSettings::VersionlessSubcommands)
.global_setting(AppSettings::DisableHelpSubcommand)
.max_term_width(MAX_TERM_WIDTH)
Expand Down
Loading