Remove old deprecated flags, move light client, updater and private t…

…x flags to deprecated section
openethereum · May 21, 2020 · 86b71ee · 86b71ee
1 parent 6179a9d
commit 86b71ee
Show file tree

Hide file tree

Showing 9 changed files with 217 additions and 899 deletions.
diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs
diff --git a/parity/cli/presets/config.mining.toml b/parity/cli/presets/config.mining.toml
@@ -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]
@@ -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
 

diff --git a/parity/cli/presets/config.non-standard-ports.toml b/parity/cli/presets/config.non-standard-ports.toml
@@ -1,5 +1,5 @@
 [network]
-# Parity will listen for connections on port 30305.
+# OpenEthereum will listen for connections on port 30305.
 port = 30305
 
 [rpc]

diff --git a/parity/cli/tests/config.full.toml b/parity/cli/tests/config.full.toml
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/parity/cli/tests/config.toml b/parity/cli/tests/config.toml
@@ -37,11 +37,6 @@ server_threads = 13
 [ipc]
 apis = ["rpc", "eth"]
 
-[dapps]
-port = 8080
-user = "username"
-pass = "password"
-
 [secretstore]
 http_port = 8082
 port = 8083
@@ -84,7 +79,3 @@ log_file = "/var/log/parity.log"
 color = true
 ports_shift = 0
 unsafe_expose = false
-
-[whisper]
-enabled = true
-pool_size = 50
diff --git a/parity/cli/usage.rs b/parity/cli/usage.rs
@@ -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)