diff options
| author | Ryan Ofsky <ryan@ofsky.org> | 2022-04-12 03:00:28 -0400 |
|---|---|---|
| committer | Ryan Ofsky <ryan@ofsky.org> | 2022-04-26 10:09:39 -0400 |
| commit | 1d4122dfefcb0a33c3d5bf7bbe2c7cd7e09d3764 (patch) | |
| tree | d11be998fc19ca96b166d8f1f8c9b6ba84d1bc72 /test/functional/feature_config_args.py | |
| parent | f4005af3ec455a7fcfb94aa1a6673e821ac3d743 (diff) | |
init: Allow -proxy="" setting values
This drops the `No proxy server specified. Use -proxy=<ip> or -proxy=<ip:port>`
error when a empty `-proxy=` command line argument, `bitcoin.conf` value, or
`settings.json` value is specified, and just makes bitcoin connect and listen
normally in these cases.
The error was originally added in https://github.com/bitcoin/bitcoin/pull/20003
to prevent a bare `-proxy` command line argument with no assignment from
clearing proxy settings. But it was implemented in an overbroad way breaking
empty `-proxy=` assignments as well.
The motivation for this change is to prevent a GUI bug that happens with
https://github.com/bitcoin/bitcoin/pull/15936, reported in
https://github.com/bitcoin/bitcoin/pull/15936#pullrequestreview-937685759 by
vasild, that happens after a proxy setting is enabled and disabled in the GUI.
But this change also makes sense on its own to remove a potentially confusing
error message.
Diffstat (limited to 'test/functional/feature_config_args.py')
| -rwxr-xr-x | test/functional/feature_config_args.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/feature_config_args.py b/test/functional/feature_config_args.py index eea5fa24ee..682ea62438 100755 --- a/test/functional/feature_config_args.py +++ b/test/functional/feature_config_args.py @@ -85,7 +85,7 @@ class ConfArgsTest(BitcoinTestFramework): def test_invalid_command_line_options(self): self.nodes[0].assert_start_raises_init_error( - expected_msg='Error: No proxy server specified. Use -proxy=<ip> or -proxy=<ip:port>.', + expected_msg='Error: Error parsing command line arguments: Can not set -proxy with no value. Please specify value with -proxy=value.', extra_args=['-proxy'], ) |