From 87094fc83f7ede4a6d4d056c5987d2ae6f9b3663 Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Tue, 17 Aug 2021 15:47:18 -0400 Subject: [PATCH 1/3] changed default setting save_files to be false --- lbry/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lbry/conf.py b/lbry/conf.py index 480be87ab..d29b76237 100644 --- a/lbry/conf.py +++ b/lbry/conf.py @@ -704,7 +704,7 @@ class Config(CLIConfig): blockchain_name = String("Blockchain name - lbrycrd_main, lbrycrd_regtest, or lbrycrd_testnet", 'lbrycrd_main') # daemon - save_files = Toggle("Save downloaded files when calling `get` by default", True) + save_files = Toggle("Save downloaded files when calling `get` by default", False) components_to_skip = Strings("components which will be skipped during start-up of daemon", []) share_usage_data = Toggle( "Whether to share usage stats and diagnostic info with LBRY.", False, From f14010bd5b1c3c204f6bbe22e46990a4cb1fc0b1 Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Tue, 17 Aug 2021 16:36:48 -0400 Subject: [PATCH 2/3] explicitly set save_files = True in tests --- .../unit/blob_exchange/test_transfer_blob.py | 24 +++++++++++++------ tests/unit/stream/test_stream_manager.py | 1 + 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/tests/unit/blob_exchange/test_transfer_blob.py b/tests/unit/blob_exchange/test_transfer_blob.py index ed46dbeff..5bdf2aac2 100644 --- a/tests/unit/blob_exchange/test_transfer_blob.py +++ b/tests/unit/blob_exchange/test_transfer_blob.py @@ -20,7 +20,7 @@ from lbry.dht.peer import PeerManager, make_kademlia_peer def mock_config(): - config = Config() + config = Config(save_files=True) config.fixed_peer_delay = 10000 return config @@ -34,15 +34,25 @@ class BlobExchangeTestBase(AsyncioTestCase): self.addCleanup(shutil.rmtree, self.client_wallet_dir) self.addCleanup(shutil.rmtree, self.client_dir) self.addCleanup(shutil.rmtree, self.server_dir) - self.server_config = Config(data_dir=self.server_dir, download_dir=self.server_dir, wallet=self.server_dir, - fixed_peers=[]) + self.server_config = Config( + data_dir=self.server_dir, + download_dir=self.server_dir, + wallet=self.server_dir, + save_files=True, + fixed_peers=[] + ) self.server_config.transaction_cache_size = 10000 self.server_storage = SQLiteStorage(self.server_config, os.path.join(self.server_dir, "lbrynet.sqlite")) self.server_blob_manager = BlobManager(self.loop, self.server_dir, self.server_storage, self.server_config) self.server = BlobServer(self.loop, self.server_blob_manager, 'bQEaw42GXsgCAGio1nxFncJSyRmnztSCjP') - self.client_config = Config(data_dir=self.client_dir, download_dir=self.client_dir, - wallet=self.client_wallet_dir, fixed_peers=[]) + self.client_config = Config( + data_dir=self.client_dir, + download_dir=self.client_dir, + wallet=self.client_wallet_dir, + save_files=True, + fixed_peers=[] + ) self.client_config.transaction_cache_size = 10000 self.client_storage = SQLiteStorage(self.client_config, os.path.join(self.client_dir, "lbrynet.sqlite")) self.client_blob_manager = BlobManager(self.loop, self.client_dir, self.client_storage, self.client_config) @@ -101,7 +111,7 @@ class TestBlobExchange(BlobExchangeTestBase): second_client_dir = tempfile.mkdtemp() self.addCleanup(shutil.rmtree, second_client_dir) - second_client_conf = Config() + second_client_conf = Config(save_files=True) second_client_storage = SQLiteStorage(second_client_conf, os.path.join(second_client_dir, "lbrynet.sqlite")) second_client_blob_manager = BlobManager( self.loop, second_client_dir, second_client_storage, second_client_conf @@ -196,7 +206,7 @@ class TestBlobExchange(BlobExchangeTestBase): second_client_dir = tempfile.mkdtemp() self.addCleanup(shutil.rmtree, second_client_dir) - second_client_conf = Config() + second_client_conf = Config(save_files=True) second_client_storage = SQLiteStorage(second_client_conf, os.path.join(second_client_dir, "lbrynet.sqlite")) second_client_blob_manager = BlobManager( diff --git a/tests/unit/stream/test_stream_manager.py b/tests/unit/stream/test_stream_manager.py index 904cc1574..a6767509f 100644 --- a/tests/unit/stream/test_stream_manager.py +++ b/tests/unit/stream/test_stream_manager.py @@ -105,6 +105,7 @@ async def get_mock_wallet(sd_hash, storage, wallet_dir, balance=10.0, fee=None): wallet.generate_account(ledger) manager = WalletManager() manager.config = Config() + manager.config.save_files = True manager.config.transaction_cache_size = 10000 manager.wallets.append(wallet) manager.ledgers[Ledger] = ledger From d5bae3a8c63d3e68af286dc72bc6cff80997f5f1 Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Thu, 19 Aug 2021 09:31:17 -0400 Subject: [PATCH 3/3] manually set save_files=True in unit tests --- lbry/testcase.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lbry/testcase.py b/lbry/testcase.py index 210b99b3c..0ab64686c 100644 --- a/lbry/testcase.py +++ b/lbry/testcase.py @@ -353,6 +353,7 @@ class CommandTestCase(IntegrationTestCase): self.server_config = Config( data_dir=server_tmp_dir, wallet_dir=server_tmp_dir, + save_files=True, download_dir=server_tmp_dir ) self.server_config.transaction_cache_size = 10000 @@ -395,6 +396,7 @@ class CommandTestCase(IntegrationTestCase): # needed during instantiation to access known_hubs path data_dir=wallet_node.data_path, wallet_dir=wallet_node.data_path, + save_files=True, download_dir=wallet_node.data_path ) conf.upload_dir = upload_dir # not a real conf setting