diff options
| author | Micah Lee <micah@micahflee.com> | 2021-10-26 21:07:38 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2021-10-26 21:07:38 -0700 |
| commit | 9515fe6aaf387868c1406c972435591edb70f785 (patch) | |
| tree | 34cb0c4645be15dbc6d26bb1008e395b783b3186 /cli | |
| parent | 2b3b6d7635b935741646281c7a206a71993c0f9e (diff) | |
| download | onionshare-9515fe6aaf387868c1406c972435591edb70f785.tar.gz onionshare-9515fe6aaf387868c1406c972435591edb70f785.zip | |
Remove all references to old settings
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/onionshare_cli/onion.py | 6 | ||||
| -rw-r--r-- | cli/tests/test_cli_settings.py | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/cli/onionshare_cli/onion.py b/cli/onionshare_cli/onion.py index 5ce83261..536b9ba0 100644 --- a/cli/onionshare_cli/onion.py +++ b/cli/onionshare_cli/onion.py @@ -424,11 +424,7 @@ class Onion(object): time.sleep(0.2) # If using bridges, it might take a bit longer to connect to Tor - if ( - self.settings.get("tor_bridges_use_custom_bridges") - or self.settings.get("tor_bridges_use_obfs4") - or self.settings.get("tor_bridges_use_meek_lite_azure") - ): + if self.settings.get("bridges_enabled"): # Only override timeout if a custom timeout has not been passed in if connect_timeout == 120: connect_timeout = 150 diff --git a/cli/tests/test_cli_settings.py b/cli/tests/test_cli_settings.py index c7140e70..9513b013 100644 --- a/cli/tests/test_cli_settings.py +++ b/cli/tests/test_cli_settings.py @@ -141,10 +141,10 @@ class TestSettings: def test_set_custom_bridge(self, settings_obj): settings_obj.set( - "tor_bridges_use_custom_bridges", + "bridges_custom", "Bridge 45.3.20.65:9050 21300AD88890A49C429A6CB9959CFD44490A8F6E", ) assert ( - settings_obj._settings["tor_bridges_use_custom_bridges"] + settings_obj._settings["bridges_custom"] == "Bridge 45.3.20.65:9050 21300AD88890A49C429A6CB9959CFD44490A8F6E" ) |