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

Commit 525fea6

Browse files
committed
Remove old deprecated flags, move light client, updater and private tx flags to deprecated section
1 parent 44f088b commit 525fea6

9 files changed

+214
-895
lines changed

parity/cli/mod.rs

+117-455
Large diffs are not rendered by default.

parity/cli/presets/config.mining.toml

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
[network]
2-
# Parity will try to maintain connection to at least 50 peers.
2+
# OpenEthereum will try to maintain connection to at least 50 peers.
33
min_peers = 50
4-
# Parity will maintain at most 100 peers.
4+
# OpenEthereum will maintain at most 100 peers.
55
max_peers = 100
66

77
[ipc]
8-
# You won't be able to use IPC to interact with Parity.
9-
disable = true
10-
11-
[dapps]
12-
# You won't be able to access any web Dapps.
8+
# You won't be able to use IPC to interact with OpenEthereum.
139
disable = true
1410

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

parity/cli/presets/config.non-standard-ports.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[network]
2-
# Parity will listen for connections on port 30305.
2+
# OpenEthereum will listen for connections on port 30305.
33
port = 30305
44

55
[rpc]

parity/cli/tests/config.full.toml

+1-22
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,6 @@ account = "0xdeadbeefcafe0000000000000000000000000000"
3333
sstore_url = "http://localhost:8082"
3434
sstore_threshold = 0
3535

36-
[ui]
37-
force = false
38-
disable = false
39-
port = 8180
40-
interface = "127.0.0.1"
41-
path = "$HOME/.parity/signer"
42-
4336
[network]
4437
port = 30303
4538
min_peers = 25
@@ -80,16 +73,6 @@ disable = false
8073
path = "$HOME/.parity/jsonrpc.ipc"
8174
apis = ["web3", "eth", "net", "parity", "parity_accounts", "personal", "traces", "rpc", "secretstore"]
8275

83-
[dapps]
84-
disable = false
85-
port = 8080
86-
interface = "local"
87-
hosts = ["none"]
88-
path = "$HOME/.parity/dapps"
89-
# authorization:
90-
user = "test_user"
91-
pass = "test_pass"
92-
9376
[secretstore]
9477
disable = false
9578
disable_http = false
@@ -132,7 +115,7 @@ tx_gas_limit = "10000000"
132115
tx_time_limit = 100 #ms
133116
tx_queue_no_unfamiliar_locals = false
134117
tx_queue_no_early_reject = false
135-
extra_data = "Parity"
118+
extra_data = "OpenEthereum"
136119
remove_solved = false
137120
notify_work = ["http://localhost:3001"]
138121
refuse_service_transactions = false
@@ -166,7 +149,3 @@ disable_periodic = false
166149
logging = "own_tx=trace"
167150
log_file = "/var/log/parity.log"
168151
color = true
169-
170-
[whisper]
171-
enabled = false
172-
pool_size = 20

parity/cli/tests/config.toml

-9
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ server_threads = 13
3636
[ipc]
3737
apis = ["rpc", "eth"]
3838

39-
[dapps]
40-
port = 8080
41-
user = "username"
42-
pass = "password"
43-
4439
[secretstore]
4540
http_port = 8082
4641
port = 8083
@@ -83,7 +78,3 @@ log_file = "/var/log/parity.log"
8378
color = true
8479
ports_shift = 0
8580
unsafe_expose = false
86-
87-
[whisper]
88-
enabled = true
89-
pool_size = 50

parity/cli/usage.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ macro_rules! usage {
603603
}
604604
)*
605605

606-
let matches = App::new("Parity")
606+
let matches = App::new("OpenEthereum")
607607
.global_setting(AppSettings::VersionlessSubcommands)
608608
.global_setting(AppSettings::DisableHelpSubcommand)
609609
.max_term_width(MAX_TERM_WIDTH)

0 commit comments

Comments
 (0)