From b8a74fac97af5c40f0fd5f54eb93c18765a2b98a Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Tue, 22 Dec 2020 01:03:04 +0000 Subject: [PATCH] * revert pow to 5 * is is_alive in sneakernet observer --- scripts/disable-dev-config.py | 4 ++-- src/sneakernet/__init__.py | 4 ++-- static-data/default_config.json | 2 +- tests/test_default_config_json.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/disable-dev-config.py b/scripts/disable-dev-config.py index d2b847b8..ca337a12 100755 --- a/scripts/disable-dev-config.py +++ b/scripts/disable-dev-config.py @@ -18,8 +18,8 @@ conf['general']['display_header'] = True conf['general']['security_level'] = 0 conf['general']['use_bootstrap_list'] = True conf['onboarding']['done'] = False -conf['general']['minimum_block_pow'] = 6 -conf['general']['minimum_send_pow'] = 6 +conf['general']['minimum_block_pow'] = 5 +conf['general']['minimum_send_pow'] = 5 conf['log']['file']['remove_on_exit'] = True conf['transports']['lan'] = True conf['transports']['tor'] = True diff --git a/src/sneakernet/__init__.py b/src/sneakernet/__init__.py index 9c78b568..6b4002a8 100644 --- a/src/sneakernet/__init__.py +++ b/src/sneakernet/__init__.py @@ -63,6 +63,6 @@ def sneakernet_import_thread(): for path in watch_paths: observer.schedule(_Importer(), path, recursive=True) observer.start() - while observer.isAlive(): + while observer.is_alive(): # call import func with timeout - observer.join(60) \ No newline at end of file + observer.join(60) diff --git a/static-data/default_config.json b/static-data/default_config.json index dcad2e50..eb787bbf 100755 --- a/static-data/default_config.json +++ b/static-data/default_config.json @@ -77,4 +77,4 @@ "public_remote_hosts": [], "theme": "dark" } -} +} \ No newline at end of file diff --git a/tests/test_default_config_json.py b/tests/test_default_config_json.py index 2678b13c..76ec3e65 100644 --- a/tests/test_default_config_json.py +++ b/tests/test_default_config_json.py @@ -30,8 +30,8 @@ class OnionrConfig(unittest.TestCase): self.assertEqual(conf['general']['ephemeral_tunnels'], False) self.assertEqual(conf['general']['hide_created_blocks'], True) self.assertEqual(conf['general']['insert_deniable_blocks'], True) - self.assertEqual(conf['general']['minimum_block_pow'], 6) - self.assertEqual(conf['general']['minimum_send_pow'], 6) + self.assertEqual(conf['general']['minimum_block_pow'], 5) + self.assertEqual(conf['general']['minimum_send_pow'], 5) self.assertEqual(conf['general']['public_key'], '') self.assertEqual(conf['general']['random_bind_ip'], True) self.assertEqual(conf['general']['security_level'], 0)