From f9b4d465990d6f1c39e580a5f29b458f5c968222 Mon Sep 17 00:00:00 2001
From: Kay Kurokawa <kay@lbry.io>
Date: Fri, 16 Jun 2017 13:16:19 -0400
Subject: [PATCH 01/13] work on removing manage from BlobManager and simplify
blob deletion
---
lbrynet/core/BlobManager.py | 79 +++++++------------------------------
1 file changed, 14 insertions(+), 65 deletions(-)
diff --git a/lbrynet/core/BlobManager.py b/lbrynet/core/BlobManager.py
index 548f28b6b..dc572be64 100644
--- a/lbrynet/core/BlobManager.py
+++ b/lbrynet/core/BlobManager.py
@@ -11,7 +11,6 @@ from lbrynet.core.server.DHTHashAnnouncer import DHTHashSupplier
from lbrynet.core.Error import NoSuchBlobError
from lbrynet.core.sqlite_helpers import rerun_if_locked
-
log = logging.getLogger(__name__)
@@ -90,20 +89,16 @@ class DiskBlobManager(BlobManager):
# be thousands of blobs loaded up, many stale
self.blobs = {}
self.blob_hashes_to_delete = {} # {blob_hash: being_deleted (True/False)}
- self._next_manage_call = None
+
+ @defer.inlineCallbacks
def setup(self):
log.info("Setting up the DiskBlobManager. blob_dir: %s, db_file: %s", str(self.blob_dir),
str(self.db_file))
- d = self._open_db()
- d.addCallback(lambda _: self._manage())
- return d
+ yield self._open_db()
def stop(self):
log.info("Stopping the DiskBlobManager")
- if self._next_manage_call is not None and self._next_manage_call.active():
- self._next_manage_call.cancel()
- self._next_manage_call = None
self.db_conn.close()
return defer.succeed(True)
@@ -150,11 +145,6 @@ class DiskBlobManager(BlobManager):
d = self.blob_completed(new_blob, next_announce_time)
return d
- def delete_blobs(self, blob_hashes):
- for blob_hash in blob_hashes:
- if not blob_hash in self.blob_hashes_to_delete:
- self.blob_hashes_to_delete[blob_hash] = False
-
def immediate_announce_all_blobs(self):
d = self._get_all_verified_blob_hashes()
d.addCallback(self._immediate_announce)
@@ -173,58 +163,17 @@ class DiskBlobManager(BlobManager):
d = self._add_blob_to_upload_history(blob_hash, host, rate)
return d
- def _manage(self):
- from twisted.internet import reactor
-
- d = self._delete_blobs_marked_for_deletion()
-
- def set_next_manage_call():
- self._next_manage_call = reactor.callLater(1, self._manage)
-
- d.addCallback(lambda _: set_next_manage_call())
-
- def _delete_blobs_marked_for_deletion(self):
-
- def remove_from_list(b_h):
- del self.blob_hashes_to_delete[b_h]
- return b_h
-
- def set_not_deleting(err, b_h):
- log.warning("Failed to delete blob %s. Reason: %s", str(b_h), err.getErrorMessage())
- self.blob_hashes_to_delete[b_h] = False
- return err
-
- def delete_from_db(result):
- b_hs = [r[1] for r in result if r[0] is True]
- if b_hs:
- d = self._delete_blobs_from_db(b_hs)
- else:
- d = defer.succeed(True)
-
- def log_error(err):
- log.warning(
- "Failed to delete completed blobs from the db: %s", err.getErrorMessage())
-
- d.addErrback(log_error)
- return d
-
- def delete(blob, b_h):
- d = blob.delete()
- d.addCallbacks(lambda _: remove_from_list(b_h), set_not_deleting, errbackArgs=(b_h,))
- return d
-
- ds = []
- for blob_hash, being_deleted in self.blob_hashes_to_delete.items():
- if being_deleted is False:
- self.blob_hashes_to_delete[blob_hash] = True
- d = self.get_blob(blob_hash)
- d.addCallbacks(
- delete, set_not_deleting,
- callbackArgs=(blob_hash,), errbackArgs=(blob_hash,))
- ds.append(d)
- dl = defer.DeferredList(ds, consumeErrors=True)
- dl.addCallback(delete_from_db)
- return defer.DeferredList(ds)
+ @defer.inlineCallbacks
+ def delete_blobs(self, blob_hashes):
+ bh_to_delete_from_db = []
+ for blob_hash in blob_hashes:
+ try:
+ blob = yield self.get_blob(blob_hash)
+ yield blob.delete()
+ bh_to_delete_from_db.append(blob_hash)
+ except Exception as e:
+ log.warning("Failed to delete blob file. Reason: %s", e)
+ yield self._delete_blobs_from_db(bh_to_delete_from_db)
######### database calls #########
From 14b2bb3019c35823b85a714f6d7211760d25c7b0 Mon Sep 17 00:00:00 2001
From: Kay Kurokawa <kay@lbry.io>
Date: Fri, 16 Jun 2017 13:13:41 -0400
Subject: [PATCH 02/13] add test for BlobManager
---
lbrynet/core/BlobManager.py | 7 +-
tests/unit/core/test_BlobManager.py | 112 ++++++++++++++++++++++++++++
2 files changed, 118 insertions(+), 1 deletion(-)
create mode 100644 tests/unit/core/test_BlobManager.py
diff --git a/lbrynet/core/BlobManager.py b/lbrynet/core/BlobManager.py
index dc572be64..e641fda55 100644
--- a/lbrynet/core/BlobManager.py
+++ b/lbrynet/core/BlobManager.py
@@ -257,8 +257,13 @@ class DiskBlobManager(BlobManager):
return self.db_conn.runInteraction(delete_blobs)
@rerun_if_locked
- def _get_all_verified_blob_hashes(self):
+ def _get_all_blob_hashes(self):
d = self.db_conn.runQuery("select blob_hash from blobs")
+ return d
+
+ @rerun_if_locked
+ def _get_all_verified_blob_hashes(self):
+ d = self._get_all_blob_hashes()
def get_verified_blobs(blobs):
verified_blobs = []
diff --git a/tests/unit/core/test_BlobManager.py b/tests/unit/core/test_BlobManager.py
new file mode 100644
index 000000000..1ef13a2d2
--- /dev/null
+++ b/tests/unit/core/test_BlobManager.py
@@ -0,0 +1,112 @@
+import tempfile
+import shutil
+import mock
+import os
+import random
+import string
+
+from tests.util import random_lbry_hash
+from lbrynet.core.BlobManager import DiskBlobManager
+from lbrynet.core.HashAnnouncer import DummyHashAnnouncer
+from lbrynet.core.Peer import Peer
+from lbrynet.core.cryptoutils import get_lbry_hash_obj
+from twisted.trial import unittest
+
+from twisted.internet import defer
+
+class BlobManagerTest(unittest.TestCase):
+ def setUp(self):
+ self.blob_dir = tempfile.mkdtemp()
+ self.db_dir = tempfile.mkdtemp()
+ hash_announcer = DummyHashAnnouncer()
+ self.bm = DiskBlobManager(hash_announcer, self.blob_dir, self.db_dir)
+ self.peer = Peer('somehost',22)
+
+ def tearDown(self):
+ self.bm.stop()
+ shutil.rmtree(self.blob_dir)
+ shutil.rmtree(self.db_dir)
+
+ @defer.inlineCallbacks
+ def _create_and_add_blob(self):
+ # create and add blob to blob manager
+ data_len = random.randint(1,1000)
+ data = ''.join(random.choice(string.lowercase) for data_len in range(data_len))
+
+ hashobj = get_lbry_hash_obj()
+ hashobj.update(data)
+ out=hashobj.hexdigest()
+ blob_hash=out
+
+ # create new blob
+ yield self.bm.setup()
+ blob = yield self.bm.get_blob(blob_hash,len(data))
+
+ finished_d, write, cancel =yield blob.open_for_writing(self.peer)
+ yield write(data)
+ yield self.bm.blob_completed(blob)
+ yield self.bm.add_blob_to_upload_history(blob_hash,'test',len(data))
+
+ # check to see if blob is there
+ self.assertTrue(os.path.isfile(os.path.join(self.blob_dir,blob_hash)))
+ blobs = yield self.bm.get_all_verified_blobs()
+ self.assertTrue(blob_hash in blobs)
+ defer.returnValue(blob_hash)
+
+ @defer.inlineCallbacks
+ def test_create_blob(self):
+ blob_hashes = []
+
+ # create a bunch of blobs
+ for i in range(0,10):
+ blob_hash = yield self._create_and_add_blob()
+ blob_hashes.append(blob_hash)
+ blobs = yield self.bm.get_all_verified_blobs()
+ self.assertEqual(10,len(blobs))
+
+
+ @defer.inlineCallbacks
+ def test_delete_blob(self):
+ # create blob
+ blob_hash = yield self._create_and_add_blob()
+ blobs = yield self.bm.get_all_verified_blobs()
+ self.assertEqual(len(blobs),1)
+
+ # delete blob
+ yield self.bm.delete_blobs([blob_hash])
+ self.assertFalse(os.path.isfile(os.path.join(self.blob_dir,blob_hash)))
+ blobs = yield self.bm.get_all_verified_blobs()
+ self.assertEqual(len(blobs),0)
+ blobs = yield self.bm._get_all_blob_hashes()
+ self.assertEqual(len(blobs),0)
+
+ # delete blob that does not exist, nothing will
+ # happen
+ blob_hash= random_lbry_hash()
+ out = yield self.bm.delete_blobs([blob_hash])
+
+
+ @defer.inlineCallbacks
+ def test_delete_open_blob(self):
+ # Test that a blob that is opened for writing will not be deleted
+
+ # create blobs
+ blob_hashes =[]
+ for i in range(0,10):
+ blob_hash = yield self._create_and_add_blob()
+ blob_hashes.append(blob_hash)
+ blobs = yield self.bm.get_all_verified_blobs()
+ self.assertEqual(len(blobs),10)
+
+ # open the last blob
+ blob = yield self.bm.get_blob(blob_hashes[-1])
+ yield blob.open_for_writing(self.peer)
+
+ # delete the last blob and check if it still exists
+ out = yield self.bm.delete_blobs([blob_hash])
+ blobs = yield self.bm.get_all_verified_blobs()
+ self.assertEqual(len(blobs),10)
+ self.assertTrue(blob_hashes[-1] in blobs)
+ self.assertTrue(os.path.isfile(os.path.join(self.blob_dir,blob_hashes[-1])))
+
+
From 613278de121305e01a9636c1d7a805dbbb6a9f52 Mon Sep 17 00:00:00 2001
From: Kay Kurokawa <kay@lbry.io>
Date: Fri, 16 Jun 2017 13:16:38 -0400
Subject: [PATCH 03/13] fix test_misc, check before deleting
---
tests/functional/test_misc.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/functional/test_misc.py b/tests/functional/test_misc.py
index f38d9a951..bd1919aa5 100644
--- a/tests/functional/test_misc.py
+++ b/tests/functional/test_misc.py
@@ -746,8 +746,9 @@ class TestTransfer(TestCase):
yield download_file(sd_hash)
yield check_md5_sum()
yield download_file(sd_hash)
- yield delete_lbry_file()
+
yield check_lbry_file()
+ yield delete_lbry_file()
def stop(arg):
if isinstance(arg, Failure):
From b4224812baa1e9f708fb184878e1f6840c758a02 Mon Sep 17 00:00:00 2001
From: Kay Kurokawa <kay@lbry.io>
Date: Fri, 23 Jun 2017 10:26:51 -0400
Subject: [PATCH 04/13] add changelog
---
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b75a4e18b..11e0ca8bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ at anytime.
* Fixed some log messages throwing exceptions
* Fix shutdown of the blob tracker by Session
* Fixed claim_new_support docstrings
+ * Fixed BlobManager causing functional tests to fail, removed its unneeded manage() loop
### Deprecated
*
From 30a8a951b24dbb027cbbcc63add6f12931c91c60 Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Fri, 23 Jun 2017 13:26:56 -0400
Subject: [PATCH 05/13] =?UTF-8?q?Bump=20version:=200.14.1rc1=20=E2=86=92?=
=?UTF-8?q?=200.14.2rc1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.bumpversion.cfg | 2 +-
lbrynet/__init__.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 3a2d0e4cd..04b415e6a 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 0.14.1rc1
+current_version = 0.14.2rc1
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<candidate>\d+))?
diff --git a/lbrynet/__init__.py b/lbrynet/__init__.py
index 39c5f0f88..ee0e48b62 100644
--- a/lbrynet/__init__.py
+++ b/lbrynet/__init__.py
@@ -1,6 +1,6 @@
import logging
-__version__ = "0.14.1rc1"
+__version__ = "0.14.2rc1"
version = tuple(__version__.split('.'))
logging.getLogger(__name__).addHandler(logging.NullHandler())
From 1ec3218f181e80b68f67a9b7ccc748975d14bfa0 Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Sun, 25 Jun 2017 21:03:37 -0400
Subject: [PATCH 06/13] rename lbrynet.lbryfile to lbrynet.lbry_file
---
.../EncryptedFileMetadataManager.py | 0
lbrynet/{lbryfile => lbry_file}/StreamDescriptor.py | 0
lbrynet/lbry_file/__init__.py | 2 ++
.../client/EncryptedFileDownloader.py | 4 ++--
.../client/EncryptedFileMetadataHandler.py | 0
.../client/EncryptedFileOptions.py | 4 ++--
lbrynet/{lbryfile => lbry_file}/client/__init__.py | 0
lbrynet/lbryfile/__init__.py | 2 --
lbrynet/lbryfilemanager/EncryptedFileCreator.py | 2 +-
lbrynet/lbryfilemanager/EncryptedFileDownloader.py | 6 +++---
lbrynet/lbryfilemanager/EncryptedFileManager.py | 2 +-
lbrynet/lbrynet_daemon/Daemon.py | 10 +++++-----
lbrynet/lbrynet_daemon/Publisher.py | 2 +-
tests/functional/test_misc.py | 8 ++++----
tests/functional/test_reflector.py | 10 +++++-----
tests/functional/test_streamify.py | 10 +++++-----
.../lbryfile/client/test_EncryptedFileDownloader.py | 2 +-
.../unit/lbryfile/test_EncryptedFileMetadataManager.py | 2 +-
tests/unit/lbrynet_daemon/test_Downloader.py | 2 +-
19 files changed, 34 insertions(+), 34 deletions(-)
rename lbrynet/{lbryfile => lbry_file}/EncryptedFileMetadataManager.py (100%)
rename lbrynet/{lbryfile => lbry_file}/StreamDescriptor.py (100%)
create mode 100644 lbrynet/lbry_file/__init__.py
rename lbrynet/{lbryfile => lbry_file}/client/EncryptedFileDownloader.py (98%)
rename lbrynet/{lbryfile => lbry_file}/client/EncryptedFileMetadataHandler.py (100%)
rename lbrynet/{lbryfile => lbry_file}/client/EncryptedFileOptions.py (92%)
rename lbrynet/{lbryfile => lbry_file}/client/__init__.py (100%)
delete mode 100644 lbrynet/lbryfile/__init__.py
diff --git a/lbrynet/lbryfile/EncryptedFileMetadataManager.py b/lbrynet/lbry_file/EncryptedFileMetadataManager.py
similarity index 100%
rename from lbrynet/lbryfile/EncryptedFileMetadataManager.py
rename to lbrynet/lbry_file/EncryptedFileMetadataManager.py
diff --git a/lbrynet/lbryfile/StreamDescriptor.py b/lbrynet/lbry_file/StreamDescriptor.py
similarity index 100%
rename from lbrynet/lbryfile/StreamDescriptor.py
rename to lbrynet/lbry_file/StreamDescriptor.py
diff --git a/lbrynet/lbry_file/__init__.py b/lbrynet/lbry_file/__init__.py
new file mode 100644
index 000000000..a073d3403
--- /dev/null
+++ b/lbrynet/lbry_file/__init__.py
@@ -0,0 +1,2 @@
+from lbrynet.lbry_file.StreamDescriptor import get_sd_info
+from lbrynet.lbry_file.StreamDescriptor import publish_sd_blob
diff --git a/lbrynet/lbryfile/client/EncryptedFileDownloader.py b/lbrynet/lbry_file/client/EncryptedFileDownloader.py
similarity index 98%
rename from lbrynet/lbryfile/client/EncryptedFileDownloader.py
rename to lbrynet/lbry_file/client/EncryptedFileDownloader.py
index fba1c0461..e18c6f2cf 100644
--- a/lbrynet/lbryfile/client/EncryptedFileDownloader.py
+++ b/lbrynet/lbry_file/client/EncryptedFileDownloader.py
@@ -3,12 +3,12 @@ import binascii
from zope.interface import implements
-from lbrynet.lbryfile.StreamDescriptor import save_sd_info
+from lbrynet.lbry_file.StreamDescriptor import save_sd_info
from lbrynet.cryptstream.client.CryptStreamDownloader import CryptStreamDownloader
from lbrynet.core.client.StreamProgressManager import FullStreamProgressManager
from lbrynet.core.StreamDescriptor import StreamMetadata
from lbrynet.interfaces import IStreamDownloaderFactory
-from lbrynet.lbryfile.client.EncryptedFileMetadataHandler import EncryptedFileMetadataHandler
+from lbrynet.lbry_file.client.EncryptedFileMetadataHandler import EncryptedFileMetadataHandler
import os
from twisted.internet import defer, threads, reactor
from twisted.python.procutils import which
diff --git a/lbrynet/lbryfile/client/EncryptedFileMetadataHandler.py b/lbrynet/lbry_file/client/EncryptedFileMetadataHandler.py
similarity index 100%
rename from lbrynet/lbryfile/client/EncryptedFileMetadataHandler.py
rename to lbrynet/lbry_file/client/EncryptedFileMetadataHandler.py
diff --git a/lbrynet/lbryfile/client/EncryptedFileOptions.py b/lbrynet/lbry_file/client/EncryptedFileOptions.py
similarity index 92%
rename from lbrynet/lbryfile/client/EncryptedFileOptions.py
rename to lbrynet/lbry_file/client/EncryptedFileOptions.py
index bc1d4ad99..5ee2e86d1 100644
--- a/lbrynet/lbryfile/client/EncryptedFileOptions.py
+++ b/lbrynet/lbry_file/client/EncryptedFileOptions.py
@@ -1,5 +1,5 @@
-from lbrynet.lbryfile.StreamDescriptor import EncryptedFileStreamType
-from lbrynet.lbryfile.StreamDescriptor import EncryptedFileStreamDescriptorValidator
+from lbrynet.lbry_file.StreamDescriptor import EncryptedFileStreamType
+from lbrynet.lbry_file.StreamDescriptor import EncryptedFileStreamDescriptorValidator
from lbrynet.core.DownloadOption import DownloadOption, DownloadOptionChoice
diff --git a/lbrynet/lbryfile/client/__init__.py b/lbrynet/lbry_file/client/__init__.py
similarity index 100%
rename from lbrynet/lbryfile/client/__init__.py
rename to lbrynet/lbry_file/client/__init__.py
diff --git a/lbrynet/lbryfile/__init__.py b/lbrynet/lbryfile/__init__.py
deleted file mode 100644
index 8cd10066a..000000000
--- a/lbrynet/lbryfile/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from lbrynet.lbryfile.StreamDescriptor import get_sd_info
-from lbrynet.lbryfile.StreamDescriptor import publish_sd_blob
diff --git a/lbrynet/lbryfilemanager/EncryptedFileCreator.py b/lbrynet/lbryfilemanager/EncryptedFileCreator.py
index 69ae82fd0..99d15e5e4 100644
--- a/lbrynet/lbryfilemanager/EncryptedFileCreator.py
+++ b/lbrynet/lbryfilemanager/EncryptedFileCreator.py
@@ -8,7 +8,7 @@ import os
from lbrynet.core.StreamDescriptor import PlainStreamDescriptorWriter
from lbrynet.cryptstream.CryptStreamCreator import CryptStreamCreator
from lbrynet import conf
-from lbrynet.lbryfile.StreamDescriptor import get_sd_info
+from lbrynet.lbry_file.StreamDescriptor import get_sd_info
from lbrynet.core.cryptoutils import get_lbry_hash_obj
from twisted.protocols.basic import FileSender
diff --git a/lbrynet/lbryfilemanager/EncryptedFileDownloader.py b/lbrynet/lbryfilemanager/EncryptedFileDownloader.py
index d6d83c019..754f700fd 100644
--- a/lbrynet/lbryfilemanager/EncryptedFileDownloader.py
+++ b/lbrynet/lbryfilemanager/EncryptedFileDownloader.py
@@ -10,11 +10,11 @@ from lbrynet.core.client.StreamProgressManager import FullStreamProgressManager
from lbrynet.core.Error import NoSuchSDHash, NoSuchStreamHash
from lbrynet.core.utils import short_hash
from lbrynet.core.StreamDescriptor import StreamMetadata
-from lbrynet.lbryfile.client.EncryptedFileDownloader import EncryptedFileSaver
-from lbrynet.lbryfile.client.EncryptedFileDownloader import EncryptedFileDownloader
+from lbrynet.lbry_file.client.EncryptedFileDownloader import EncryptedFileSaver
+from lbrynet.lbry_file.client.EncryptedFileDownloader import EncryptedFileDownloader
from lbrynet.lbryfilemanager.EncryptedFileStatusReport import EncryptedFileStatusReport
from lbrynet.interfaces import IStreamDownloaderFactory
-from lbrynet.lbryfile.StreamDescriptor import save_sd_info
+from lbrynet.lbry_file.StreamDescriptor import save_sd_info
from lbrynet.core.Wallet import ClaimOutpoint
log = logging.getLogger(__name__)
diff --git a/lbrynet/lbryfilemanager/EncryptedFileManager.py b/lbrynet/lbryfilemanager/EncryptedFileManager.py
index b5d05acdd..ca5b5e350 100644
--- a/lbrynet/lbryfilemanager/EncryptedFileManager.py
+++ b/lbrynet/lbryfilemanager/EncryptedFileManager.py
@@ -13,7 +13,7 @@ from lbrynet.reflector.reupload import reflect_stream
from lbrynet.core.PaymentRateManager import NegotiatedPaymentRateManager
from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
-from lbrynet.lbryfile.StreamDescriptor import EncryptedFileStreamType
+from lbrynet.lbry_file.StreamDescriptor import EncryptedFileStreamType
from lbrynet.cryptstream.client.CryptStreamDownloader import AlreadyStoppedError
from lbrynet.cryptstream.client.CryptStreamDownloader import CurrentlyStoppingError
from lbrynet.core.sqlite_helpers import rerun_if_locked
diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py
index b79646cf9..2f4421c0b 100644
--- a/lbrynet/lbrynet_daemon/Daemon.py
+++ b/lbrynet/lbrynet_daemon/Daemon.py
@@ -25,11 +25,11 @@ from lbrynet.conf import LBRYCRD_WALLET, LBRYUM_WALLET, PTC_WALLET
from lbrynet.reflector import reupload
from lbrynet.reflector import ServerFactory as reflector_server_factory
-from lbrynet.lbryfile.client.EncryptedFileDownloader import EncryptedFileSaverFactory
-from lbrynet.lbryfile.client.EncryptedFileDownloader import EncryptedFileOpenerFactory
-from lbrynet.lbryfile.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
-from lbrynet.lbryfile.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager
-from lbrynet.lbryfile.StreamDescriptor import EncryptedFileStreamType
+from lbrynet.lbry_file.client.EncryptedFileDownloader import EncryptedFileSaverFactory
+from lbrynet.lbry_file.client.EncryptedFileDownloader import EncryptedFileOpenerFactory
+from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
+from lbrynet.lbry_file.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager
+from lbrynet.lbry_file.StreamDescriptor import EncryptedFileStreamType
from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager
from lbrynet.lbrynet_daemon.Downloader import GetStream
from lbrynet.lbrynet_daemon.Publisher import Publisher
diff --git a/lbrynet/lbrynet_daemon/Publisher.py b/lbrynet/lbrynet_daemon/Publisher.py
index 5c7ebe4e6..24fa85f27 100644
--- a/lbrynet/lbrynet_daemon/Publisher.py
+++ b/lbrynet/lbrynet_daemon/Publisher.py
@@ -6,7 +6,7 @@ from twisted.internet import defer
from lbrynet.core import file_utils
from lbrynet.lbryfilemanager.EncryptedFileCreator import create_lbry_file
-from lbrynet.lbryfile.StreamDescriptor import publish_sd_blob
+from lbrynet.lbry_file.StreamDescriptor import publish_sd_blob
log = logging.getLogger(__name__)
diff --git a/tests/functional/test_misc.py b/tests/functional/test_misc.py
index bd1919aa5..43b78bd70 100644
--- a/tests/functional/test_misc.py
+++ b/tests/functional/test_misc.py
@@ -10,8 +10,8 @@ import unittest
from Crypto import Random
from Crypto.Hash import MD5
from lbrynet import conf
-from lbrynet.lbryfile.EncryptedFileMetadataManager import TempEncryptedFileMetadataManager
-from lbrynet.lbryfile.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager
+from lbrynet.lbry_file.EncryptedFileMetadataManager import TempEncryptedFileMetadataManager
+from lbrynet.lbry_file.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager
from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager
from lbrynet.core.Session import Session
from lbrynet.core.server.BlobAvailabilityHandler import BlobAvailabilityHandlerFactory
@@ -20,8 +20,8 @@ from lbrynet.core.StreamDescriptor import BlobStreamDescriptorWriter
from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier
from lbrynet.core.StreamDescriptor import download_sd_blob
from lbrynet.lbryfilemanager.EncryptedFileCreator import create_lbry_file
-from lbrynet.lbryfile.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
-from lbrynet.lbryfile.StreamDescriptor import get_sd_info
+from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
+from lbrynet.lbry_file.StreamDescriptor import get_sd_info
from twisted.internet import defer, threads, task
from twisted.trial.unittest import TestCase
from twisted.python.failure import Failure
diff --git a/tests/functional/test_reflector.py b/tests/functional/test_reflector.py
index 2ed14f214..c15e17c13 100644
--- a/tests/functional/test_reflector.py
+++ b/tests/functional/test_reflector.py
@@ -5,7 +5,7 @@ from twisted.internet import defer, threads, error
from twisted.trial import unittest
from lbrynet import conf
-from lbrynet import lbryfile
+from lbrynet import lbry_file
from lbrynet import reflector
from lbrynet.core import BlobManager
from lbrynet.core import PeerManager
@@ -13,8 +13,8 @@ from lbrynet.core import RateLimiter
from lbrynet.core import Session
from lbrynet.core import StreamDescriptor
from lbrynet.dht.node import Node
-from lbrynet.lbryfile import EncryptedFileMetadataManager
-from lbrynet.lbryfile.client import EncryptedFileOptions
+from lbrynet.lbry_file import EncryptedFileMetadataManager
+from lbrynet.lbry_file.client import EncryptedFileOptions
from lbrynet.lbryfilemanager import EncryptedFileCreator
from lbrynet.lbryfilemanager import EncryptedFileManager
@@ -95,10 +95,10 @@ class TestReflector(unittest.TestCase):
def verify_stream_descriptor_file(stream_hash):
self.stream_hash = stream_hash
- d = lbryfile.get_sd_info(self.lbry_file_manager.stream_info_manager, stream_hash, True)
+ d = lbry_file.get_sd_info(self.lbry_file_manager.stream_info_manager, stream_hash, True)
d.addCallback(verify_equal)
d.addCallback(
- lambda _: lbryfile.publish_sd_blob(
+ lambda _: lbry_file.publish_sd_blob(
self.lbry_file_manager.stream_info_manager,
self.session.blob_manager, stream_hash
)
diff --git a/tests/functional/test_streamify.py b/tests/functional/test_streamify.py
index 4543459ea..2dfadebff 100644
--- a/tests/functional/test_streamify.py
+++ b/tests/functional/test_streamify.py
@@ -7,15 +7,15 @@ from twisted.trial.unittest import TestCase
from twisted.internet import defer, threads
from lbrynet import conf
-from lbrynet.lbryfile.EncryptedFileMetadataManager import TempEncryptedFileMetadataManager
-from lbrynet.lbryfile.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager
+from lbrynet.lbry_file.EncryptedFileMetadataManager import TempEncryptedFileMetadataManager
+from lbrynet.lbry_file.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager
from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager
from lbrynet.core.Session import Session
from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier
-from lbrynet.lbryfile import publish_sd_blob
+from lbrynet.lbry_file import publish_sd_blob
from lbrynet.lbryfilemanager.EncryptedFileCreator import create_lbry_file
-from lbrynet.lbryfile.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
-from lbrynet.lbryfile.StreamDescriptor import get_sd_info
+from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
+from lbrynet.lbry_file.StreamDescriptor import get_sd_info
from lbrynet.core.PeerManager import PeerManager
from lbrynet.core.RateLimiter import DummyRateLimiter, RateLimiter
diff --git a/tests/unit/lbryfile/client/test_EncryptedFileDownloader.py b/tests/unit/lbryfile/client/test_EncryptedFileDownloader.py
index 2c911f090..6272564b7 100644
--- a/tests/unit/lbryfile/client/test_EncryptedFileDownloader.py
+++ b/tests/unit/lbryfile/client/test_EncryptedFileDownloader.py
@@ -1,7 +1,7 @@
import os.path
from twisted.trial import unittest
from twisted.internet import defer
-from lbrynet.lbryfile.client.EncryptedFileDownloader import EncryptedFileSaver
+from lbrynet.lbry_file.client.EncryptedFileDownloader import EncryptedFileSaver
diff --git a/tests/unit/lbryfile/test_EncryptedFileMetadataManager.py b/tests/unit/lbryfile/test_EncryptedFileMetadataManager.py
index af6ba92b8..f598aaa72 100644
--- a/tests/unit/lbryfile/test_EncryptedFileMetadataManager.py
+++ b/tests/unit/lbryfile/test_EncryptedFileMetadataManager.py
@@ -2,7 +2,7 @@ import tempfile
import shutil
from twisted.trial import unittest
from twisted.internet import defer
-from lbrynet.lbryfile.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager
+from lbrynet.lbry_file.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager
from lbrynet.core import utils
from lbrynet.cryptstream.CryptBlob import CryptBlobInfo
from lbrynet.core.Error import NoSuchStreamHash
diff --git a/tests/unit/lbrynet_daemon/test_Downloader.py b/tests/unit/lbrynet_daemon/test_Downloader.py
index e5ab7fff2..7ead14280 100644
--- a/tests/unit/lbrynet_daemon/test_Downloader.py
+++ b/tests/unit/lbrynet_daemon/test_Downloader.py
@@ -9,7 +9,7 @@ from lbryschema.claim import ClaimDict
from lbrynet.core import Session, PaymentRateManager, Wallet
from lbrynet.lbrynet_daemon import Downloader
from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier,StreamMetadata
-from lbrynet.lbryfile.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
+from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
from lbrynet.core.HashBlob import TempBlob
from lbrynet.core.BlobManager import TempBlobManager
from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
From eba74b97bd640b2cb707ef356fef4e5d818af827 Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Sun, 25 Jun 2017 21:04:04 -0400
Subject: [PATCH 07/13] rename lbrynet.lbryfilemanager to lbrynet.file_manager
---
.../{lbryfilemanager => file_manager}/EncryptedFileCreator.py | 0
.../EncryptedFileDownloader.py | 2 +-
.../{lbryfilemanager => file_manager}/EncryptedFileManager.py | 4 ++--
.../EncryptedFileStatusReport.py | 0
lbrynet/{lbryfilemanager => file_manager}/__init__.py | 0
lbrynet/lbrynet_daemon/Daemon.py | 2 +-
lbrynet/lbrynet_daemon/Downloader.py | 4 ++--
lbrynet/lbrynet_daemon/Publisher.py | 2 +-
tests/functional/test_misc.py | 4 ++--
tests/functional/test_reflector.py | 4 ++--
tests/functional/test_streamify.py | 4 ++--
tests/unit/lbryfilemanager/test_EncryptedFileCreator.py | 4 ++--
tests/unit/lbryfilemanager/test_EncryptedFileManager.py | 4 ++--
tests/unit/lbrynet_daemon/test_Downloader.py | 2 +-
14 files changed, 18 insertions(+), 18 deletions(-)
rename lbrynet/{lbryfilemanager => file_manager}/EncryptedFileCreator.py (100%)
rename lbrynet/{lbryfilemanager => file_manager}/EncryptedFileDownloader.py (98%)
rename lbrynet/{lbryfilemanager => file_manager}/EncryptedFileManager.py (98%)
rename lbrynet/{lbryfilemanager => file_manager}/EncryptedFileStatusReport.py (100%)
rename lbrynet/{lbryfilemanager => file_manager}/__init__.py (100%)
diff --git a/lbrynet/lbryfilemanager/EncryptedFileCreator.py b/lbrynet/file_manager/EncryptedFileCreator.py
similarity index 100%
rename from lbrynet/lbryfilemanager/EncryptedFileCreator.py
rename to lbrynet/file_manager/EncryptedFileCreator.py
diff --git a/lbrynet/lbryfilemanager/EncryptedFileDownloader.py b/lbrynet/file_manager/EncryptedFileDownloader.py
similarity index 98%
rename from lbrynet/lbryfilemanager/EncryptedFileDownloader.py
rename to lbrynet/file_manager/EncryptedFileDownloader.py
index 754f700fd..0850086e8 100644
--- a/lbrynet/lbryfilemanager/EncryptedFileDownloader.py
+++ b/lbrynet/file_manager/EncryptedFileDownloader.py
@@ -12,7 +12,7 @@ from lbrynet.core.utils import short_hash
from lbrynet.core.StreamDescriptor import StreamMetadata
from lbrynet.lbry_file.client.EncryptedFileDownloader import EncryptedFileSaver
from lbrynet.lbry_file.client.EncryptedFileDownloader import EncryptedFileDownloader
-from lbrynet.lbryfilemanager.EncryptedFileStatusReport import EncryptedFileStatusReport
+from lbrynet.file_manager.EncryptedFileStatusReport import EncryptedFileStatusReport
from lbrynet.interfaces import IStreamDownloaderFactory
from lbrynet.lbry_file.StreamDescriptor import save_sd_info
from lbrynet.core.Wallet import ClaimOutpoint
diff --git a/lbrynet/lbryfilemanager/EncryptedFileManager.py b/lbrynet/file_manager/EncryptedFileManager.py
similarity index 98%
rename from lbrynet/lbryfilemanager/EncryptedFileManager.py
rename to lbrynet/file_manager/EncryptedFileManager.py
index ca5b5e350..914cfd242 100644
--- a/lbrynet/lbryfilemanager/EncryptedFileManager.py
+++ b/lbrynet/file_manager/EncryptedFileManager.py
@@ -11,8 +11,8 @@ from twisted.python.failure import Failure
from lbrynet.reflector.reupload import reflect_stream
from lbrynet.core.PaymentRateManager import NegotiatedPaymentRateManager
-from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
-from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
+from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
+from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
from lbrynet.lbry_file.StreamDescriptor import EncryptedFileStreamType
from lbrynet.cryptstream.client.CryptStreamDownloader import AlreadyStoppedError
from lbrynet.cryptstream.client.CryptStreamDownloader import CurrentlyStoppingError
diff --git a/lbrynet/lbryfilemanager/EncryptedFileStatusReport.py b/lbrynet/file_manager/EncryptedFileStatusReport.py
similarity index 100%
rename from lbrynet/lbryfilemanager/EncryptedFileStatusReport.py
rename to lbrynet/file_manager/EncryptedFileStatusReport.py
diff --git a/lbrynet/lbryfilemanager/__init__.py b/lbrynet/file_manager/__init__.py
similarity index 100%
rename from lbrynet/lbryfilemanager/__init__.py
rename to lbrynet/file_manager/__init__.py
diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py
index 2f4421c0b..9e6538c98 100644
--- a/lbrynet/lbrynet_daemon/Daemon.py
+++ b/lbrynet/lbrynet_daemon/Daemon.py
@@ -30,7 +30,7 @@ from lbrynet.lbry_file.client.EncryptedFileDownloader import EncryptedFileOpener
from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
from lbrynet.lbry_file.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager
from lbrynet.lbry_file.StreamDescriptor import EncryptedFileStreamType
-from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager
+from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager
from lbrynet.lbrynet_daemon.Downloader import GetStream
from lbrynet.lbrynet_daemon.Publisher import Publisher
from lbrynet.lbrynet_daemon.ExchangeRateManager import ExchangeRateManager
diff --git a/lbrynet/lbrynet_daemon/Downloader.py b/lbrynet/lbrynet_daemon/Downloader.py
index bec8a2667..a72f01423 100644
--- a/lbrynet/lbrynet_daemon/Downloader.py
+++ b/lbrynet/lbrynet_daemon/Downloader.py
@@ -7,8 +7,8 @@ from lbryschema.fee import Fee
from lbrynet.core.Error import InsufficientFundsError, KeyFeeAboveMaxAllowed
from lbrynet.core.StreamDescriptor import download_sd_blob
-from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
-from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
+from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
+from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
from lbrynet import conf
INITIALIZING_CODE = 'initializing'
diff --git a/lbrynet/lbrynet_daemon/Publisher.py b/lbrynet/lbrynet_daemon/Publisher.py
index 24fa85f27..2d9d2eeb6 100644
--- a/lbrynet/lbrynet_daemon/Publisher.py
+++ b/lbrynet/lbrynet_daemon/Publisher.py
@@ -5,7 +5,7 @@ import os
from twisted.internet import defer
from lbrynet.core import file_utils
-from lbrynet.lbryfilemanager.EncryptedFileCreator import create_lbry_file
+from lbrynet.file_manager.EncryptedFileCreator import create_lbry_file
from lbrynet.lbry_file.StreamDescriptor import publish_sd_blob
diff --git a/tests/functional/test_misc.py b/tests/functional/test_misc.py
index 43b78bd70..77d912442 100644
--- a/tests/functional/test_misc.py
+++ b/tests/functional/test_misc.py
@@ -12,14 +12,14 @@ from Crypto.Hash import MD5
from lbrynet import conf
from lbrynet.lbry_file.EncryptedFileMetadataManager import TempEncryptedFileMetadataManager
from lbrynet.lbry_file.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager
-from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager
+from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager
from lbrynet.core.Session import Session
from lbrynet.core.server.BlobAvailabilityHandler import BlobAvailabilityHandlerFactory
from lbrynet.core.client.StandaloneBlobDownloader import StandaloneBlobDownloader
from lbrynet.core.StreamDescriptor import BlobStreamDescriptorWriter
from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier
from lbrynet.core.StreamDescriptor import download_sd_blob
-from lbrynet.lbryfilemanager.EncryptedFileCreator import create_lbry_file
+from lbrynet.file_manager.EncryptedFileCreator import create_lbry_file
from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
from lbrynet.lbry_file.StreamDescriptor import get_sd_info
from twisted.internet import defer, threads, task
diff --git a/tests/functional/test_reflector.py b/tests/functional/test_reflector.py
index c15e17c13..dc6b5d30f 100644
--- a/tests/functional/test_reflector.py
+++ b/tests/functional/test_reflector.py
@@ -15,8 +15,8 @@ from lbrynet.core import StreamDescriptor
from lbrynet.dht.node import Node
from lbrynet.lbry_file import EncryptedFileMetadataManager
from lbrynet.lbry_file.client import EncryptedFileOptions
-from lbrynet.lbryfilemanager import EncryptedFileCreator
-from lbrynet.lbryfilemanager import EncryptedFileManager
+from lbrynet.file_manager import EncryptedFileCreator
+from lbrynet.file_manager import EncryptedFileManager
from tests import mocks
diff --git a/tests/functional/test_streamify.py b/tests/functional/test_streamify.py
index 2dfadebff..289dbbf90 100644
--- a/tests/functional/test_streamify.py
+++ b/tests/functional/test_streamify.py
@@ -9,11 +9,11 @@ from twisted.internet import defer, threads
from lbrynet import conf
from lbrynet.lbry_file.EncryptedFileMetadataManager import TempEncryptedFileMetadataManager
from lbrynet.lbry_file.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager
-from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager
+from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager
from lbrynet.core.Session import Session
from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier
from lbrynet.lbry_file import publish_sd_blob
-from lbrynet.lbryfilemanager.EncryptedFileCreator import create_lbry_file
+from lbrynet.file_manager.EncryptedFileCreator import create_lbry_file
from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
from lbrynet.lbry_file.StreamDescriptor import get_sd_info
from lbrynet.core.PeerManager import PeerManager
diff --git a/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py b/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py
index 704274444..cb8f520af 100644
--- a/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py
+++ b/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py
@@ -9,8 +9,8 @@ from twisted.trial import unittest
from lbrynet.core import BlobManager
from lbrynet.core import Session
from lbrynet.core.server import DHTHashAnnouncer
-from lbrynet.lbryfilemanager import EncryptedFileCreator
-from lbrynet.lbryfilemanager import EncryptedFileManager
+from lbrynet.file_manager import EncryptedFileCreator
+from lbrynet.file_manager import EncryptedFileManager
from tests import mocks
diff --git a/tests/unit/lbryfilemanager/test_EncryptedFileManager.py b/tests/unit/lbryfilemanager/test_EncryptedFileManager.py
index babf9596b..18a4d696d 100644
--- a/tests/unit/lbryfilemanager/test_EncryptedFileManager.py
+++ b/tests/unit/lbryfilemanager/test_EncryptedFileManager.py
@@ -1,7 +1,7 @@
from twisted.internet import defer
from twisted.trial import unittest
-from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
-from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager
+from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
+from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager
from tests.util import random_lbry_hash
class TestEncryptedFileManager(unittest.TestCase):
diff --git a/tests/unit/lbrynet_daemon/test_Downloader.py b/tests/unit/lbrynet_daemon/test_Downloader.py
index 7ead14280..836b363a0 100644
--- a/tests/unit/lbrynet_daemon/test_Downloader.py
+++ b/tests/unit/lbrynet_daemon/test_Downloader.py
@@ -12,7 +12,7 @@ from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier,StreamMetad
from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
from lbrynet.core.HashBlob import TempBlob
from lbrynet.core.BlobManager import TempBlobManager
-from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
+from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
from lbrynet.lbrynet_daemon.ExchangeRateManager import ExchangeRateManager
from tests.mocks import BlobAvailabilityTracker as DummyBlobAvailabilityTracker
From 967cc4c63cf5f4d851c5b4c5829fbabb5d45ddcc Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Sun, 25 Jun 2017 21:04:33 -0400
Subject: [PATCH 08/13] rename lbrynet.lbrynet_daemon to lbrynet.daemon
---
build/cli.py | 2 +-
build/daemon.py | 2 +-
lbrynet/{lbrynet_daemon => daemon}/Daemon.py | 8 ++++----
lbrynet/{lbrynet_daemon => daemon}/DaemonCLI.py | 4 ++--
lbrynet/{lbrynet_daemon => daemon}/DaemonControl.py | 4 ++--
lbrynet/{lbrynet_daemon => daemon}/DaemonRequest.py | 0
lbrynet/{lbrynet_daemon => daemon}/DaemonServer.py | 10 +++++-----
lbrynet/{lbrynet_daemon => daemon}/Downloader.py | 0
.../{lbrynet_daemon => daemon}/ExchangeRateManager.py | 0
lbrynet/{lbrynet_daemon => daemon}/FileStreamer.py | 0
lbrynet/{lbrynet_daemon => daemon}/Publisher.py | 0
lbrynet/{lbrynet_daemon => daemon}/Resources.py | 2 +-
lbrynet/{lbrynet_daemon => daemon}/__init__.py | 0
lbrynet/{lbrynet_daemon => daemon}/auth/__init__.py | 0
lbrynet/{lbrynet_daemon => daemon}/auth/auth.py | 2 +-
lbrynet/{lbrynet_daemon => daemon}/auth/client.py | 2 +-
lbrynet/{lbrynet_daemon => daemon}/auth/server.py | 4 ++--
lbrynet/{lbrynet_daemon => daemon}/auth/util.py | 0
.../daemon_scripts/Autofetcher.py | 0
.../daemon_scripts/__init__.py | 0
.../daemon_scripts/migrateto025.py | 0
scripts/gen_api_docs.py | 2 +-
setup.py | 5 ++---
tests/mocks.py | 2 +-
tests/unit/lbrynet_daemon/auth/test_server.py | 2 +-
tests/unit/lbrynet_daemon/test_Daemon.py | 4 ++--
tests/unit/lbrynet_daemon/test_DaemonCLI.py | 2 +-
tests/unit/lbrynet_daemon/test_Downloader.py | 4 ++--
tests/unit/lbrynet_daemon/test_ExchangeRateManager.py | 2 +-
29 files changed, 31 insertions(+), 32 deletions(-)
rename lbrynet/{lbrynet_daemon => daemon}/Daemon.py (99%)
rename lbrynet/{lbrynet_daemon => daemon}/DaemonCLI.py (97%)
rename lbrynet/{lbrynet_daemon => daemon}/DaemonControl.py (96%)
rename lbrynet/{lbrynet_daemon => daemon}/DaemonRequest.py (100%)
rename lbrynet/{lbrynet_daemon => daemon}/DaemonServer.py (86%)
rename lbrynet/{lbrynet_daemon => daemon}/Downloader.py (100%)
rename lbrynet/{lbrynet_daemon => daemon}/ExchangeRateManager.py (100%)
rename lbrynet/{lbrynet_daemon => daemon}/FileStreamer.py (100%)
rename lbrynet/{lbrynet_daemon => daemon}/Publisher.py (100%)
rename lbrynet/{lbrynet_daemon => daemon}/Resources.py (98%)
rename lbrynet/{lbrynet_daemon => daemon}/__init__.py (100%)
rename lbrynet/{lbrynet_daemon => daemon}/auth/__init__.py (100%)
rename lbrynet/{lbrynet_daemon => daemon}/auth/auth.py (96%)
rename lbrynet/{lbrynet_daemon => daemon}/auth/client.py (98%)
rename lbrynet/{lbrynet_daemon => daemon}/auth/server.py (99%)
rename lbrynet/{lbrynet_daemon => daemon}/auth/util.py (100%)
rename lbrynet/{lbrynet_daemon => daemon}/daemon_scripts/Autofetcher.py (100%)
rename lbrynet/{lbrynet_daemon => daemon}/daemon_scripts/__init__.py (100%)
rename lbrynet/{lbrynet_daemon => daemon}/daemon_scripts/migrateto025.py (100%)
diff --git a/build/cli.py b/build/cli.py
index 075c13b7f..5d9051c85 100644
--- a/build/cli.py
+++ b/build/cli.py
@@ -1,4 +1,4 @@
-from lbrynet.lbrynet_daemon import DaemonCLI
+from lbrynet.daemon import DaemonCLI
import logging
logging.basicConfig()
diff --git a/build/daemon.py b/build/daemon.py
index 2ed0360ab..8fa643a22 100644
--- a/build/daemon.py
+++ b/build/daemon.py
@@ -1,4 +1,4 @@
-from lbrynet.lbrynet_daemon import DaemonControl
+from lbrynet.daemon import DaemonControl
if __name__ == '__main__':
DaemonControl.start()
diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/daemon/Daemon.py
similarity index 99%
rename from lbrynet/lbrynet_daemon/Daemon.py
rename to lbrynet/daemon/Daemon.py
index 9e6538c98..469ccd72a 100644
--- a/lbrynet/lbrynet_daemon/Daemon.py
+++ b/lbrynet/daemon/Daemon.py
@@ -31,10 +31,10 @@ from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_id
from lbrynet.lbry_file.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager
from lbrynet.lbry_file.StreamDescriptor import EncryptedFileStreamType
from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager
-from lbrynet.lbrynet_daemon.Downloader import GetStream
-from lbrynet.lbrynet_daemon.Publisher import Publisher
-from lbrynet.lbrynet_daemon.ExchangeRateManager import ExchangeRateManager
-from lbrynet.lbrynet_daemon.auth.server import AuthJSONRPCServer
+from lbrynet.daemon.Downloader import GetStream
+from lbrynet.daemon.Publisher import Publisher
+from lbrynet.daemon.ExchangeRateManager import ExchangeRateManager
+from lbrynet.daemon.auth.server import AuthJSONRPCServer
from lbrynet.core.PaymentRateManager import OnlyFreePaymentsManager
from lbrynet.core import log_support, utils, system_info
from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier, download_sd_blob
diff --git a/lbrynet/lbrynet_daemon/DaemonCLI.py b/lbrynet/daemon/DaemonCLI.py
similarity index 97%
rename from lbrynet/lbrynet_daemon/DaemonCLI.py
rename to lbrynet/daemon/DaemonCLI.py
index e91cddd02..e58ffbab9 100644
--- a/lbrynet/lbrynet_daemon/DaemonCLI.py
+++ b/lbrynet/daemon/DaemonCLI.py
@@ -6,8 +6,8 @@ from docopt import docopt
from collections import OrderedDict
from lbrynet import conf
from lbrynet.core import utils
-from lbrynet.lbrynet_daemon.auth.client import JSONRPCException, LBRYAPIClient
-from lbrynet.lbrynet_daemon.Daemon import LOADING_WALLET_CODE, Daemon
+from lbrynet.daemon.auth.client import JSONRPCException, LBRYAPIClient
+from lbrynet.daemon.Daemon import LOADING_WALLET_CODE, Daemon
from lbrynet.core.system_info import get_platform
from jsonrpc.common import RPCError
from urllib2 import URLError, HTTPError
diff --git a/lbrynet/lbrynet_daemon/DaemonControl.py b/lbrynet/daemon/DaemonControl.py
similarity index 96%
rename from lbrynet/lbrynet_daemon/DaemonControl.py
rename to lbrynet/daemon/DaemonControl.py
index e9ffec5bb..cb2e90217 100644
--- a/lbrynet/lbrynet_daemon/DaemonControl.py
+++ b/lbrynet/daemon/DaemonControl.py
@@ -9,8 +9,8 @@ from jsonrpc.proxy import JSONRPCProxy
from lbrynet import analytics
from lbrynet import conf
from lbrynet.core import utils, system_info
-from lbrynet.lbrynet_daemon.auth.client import LBRYAPIClient
-from lbrynet.lbrynet_daemon.DaemonServer import DaemonServer
+from lbrynet.daemon.auth.client import LBRYAPIClient
+from lbrynet.daemon.DaemonServer import DaemonServer
log = logging.getLogger(__name__)
diff --git a/lbrynet/lbrynet_daemon/DaemonRequest.py b/lbrynet/daemon/DaemonRequest.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/DaemonRequest.py
rename to lbrynet/daemon/DaemonRequest.py
diff --git a/lbrynet/lbrynet_daemon/DaemonServer.py b/lbrynet/daemon/DaemonServer.py
similarity index 86%
rename from lbrynet/lbrynet_daemon/DaemonServer.py
rename to lbrynet/daemon/DaemonServer.py
index abec2f04e..59e62eb95 100644
--- a/lbrynet/lbrynet_daemon/DaemonServer.py
+++ b/lbrynet/daemon/DaemonServer.py
@@ -6,11 +6,11 @@ from twisted.internet import defer, reactor, error
from twisted.cred import portal
from lbrynet import conf
-from lbrynet.lbrynet_daemon.Daemon import Daemon
-from lbrynet.lbrynet_daemon.Resources import LBRYindex, HostedEncryptedFile, EncryptedFileUpload
-from lbrynet.lbrynet_daemon.auth.auth import PasswordChecker, HttpPasswordRealm
-from lbrynet.lbrynet_daemon.auth.util import initialize_api_key_file
-from lbrynet.lbrynet_daemon.DaemonRequest import DaemonRequest
+from lbrynet.daemon.Daemon import Daemon
+from lbrynet.daemon.Resources import LBRYindex, HostedEncryptedFile, EncryptedFileUpload
+from lbrynet.daemon.auth.auth import PasswordChecker, HttpPasswordRealm
+from lbrynet.daemon.auth.util import initialize_api_key_file
+from lbrynet.daemon.DaemonRequest import DaemonRequest
log = logging.getLogger(__name__)
diff --git a/lbrynet/lbrynet_daemon/Downloader.py b/lbrynet/daemon/Downloader.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/Downloader.py
rename to lbrynet/daemon/Downloader.py
diff --git a/lbrynet/lbrynet_daemon/ExchangeRateManager.py b/lbrynet/daemon/ExchangeRateManager.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/ExchangeRateManager.py
rename to lbrynet/daemon/ExchangeRateManager.py
diff --git a/lbrynet/lbrynet_daemon/FileStreamer.py b/lbrynet/daemon/FileStreamer.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/FileStreamer.py
rename to lbrynet/daemon/FileStreamer.py
diff --git a/lbrynet/lbrynet_daemon/Publisher.py b/lbrynet/daemon/Publisher.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/Publisher.py
rename to lbrynet/daemon/Publisher.py
diff --git a/lbrynet/lbrynet_daemon/Resources.py b/lbrynet/daemon/Resources.py
similarity index 98%
rename from lbrynet/lbrynet_daemon/Resources.py
rename to lbrynet/daemon/Resources.py
index ad40bf882..9abe612b5 100644
--- a/lbrynet/lbrynet_daemon/Resources.py
+++ b/lbrynet/daemon/Resources.py
@@ -11,7 +11,7 @@ from twisted.web import server, static, resource
from twisted.internet import defer, error
from lbrynet import conf
-from lbrynet.lbrynet_daemon.FileStreamer import EncryptedFileStreamer
+from lbrynet.daemon.FileStreamer import EncryptedFileStreamer
# TODO: omg, this code is essentially duplicated in Daemon
diff --git a/lbrynet/lbrynet_daemon/__init__.py b/lbrynet/daemon/__init__.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/__init__.py
rename to lbrynet/daemon/__init__.py
diff --git a/lbrynet/lbrynet_daemon/auth/__init__.py b/lbrynet/daemon/auth/__init__.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/auth/__init__.py
rename to lbrynet/daemon/auth/__init__.py
diff --git a/lbrynet/lbrynet_daemon/auth/auth.py b/lbrynet/daemon/auth/auth.py
similarity index 96%
rename from lbrynet/lbrynet_daemon/auth/auth.py
rename to lbrynet/daemon/auth/auth.py
index fc61929ea..b1a8ad702 100644
--- a/lbrynet/lbrynet_daemon/auth/auth.py
+++ b/lbrynet/daemon/auth/auth.py
@@ -3,7 +3,7 @@ from zope.interface import implementer
from twisted.cred import portal, checkers, credentials, error as cred_error
from twisted.internet import defer
from twisted.web import resource
-from lbrynet.lbrynet_daemon.auth.util import load_api_keys
+from lbrynet.daemon.auth.util import load_api_keys
log = logging.getLogger(__name__)
diff --git a/lbrynet/lbrynet_daemon/auth/client.py b/lbrynet/daemon/auth/client.py
similarity index 98%
rename from lbrynet/lbrynet_daemon/auth/client.py
rename to lbrynet/daemon/auth/client.py
index 019fc7c50..ffe0eafa2 100644
--- a/lbrynet/lbrynet_daemon/auth/client.py
+++ b/lbrynet/daemon/auth/client.py
@@ -5,7 +5,7 @@ import os
import base64
import json
-from lbrynet.lbrynet_daemon.auth.util import load_api_keys, APIKey, API_KEY_NAME, get_auth_message
+from lbrynet.daemon.auth.util import load_api_keys, APIKey, API_KEY_NAME, get_auth_message
from lbrynet import conf
from jsonrpc.proxy import JSONRPCProxy
diff --git a/lbrynet/lbrynet_daemon/auth/server.py b/lbrynet/daemon/auth/server.py
similarity index 99%
rename from lbrynet/lbrynet_daemon/auth/server.py
rename to lbrynet/daemon/auth/server.py
index 7452e084c..cf1cdad5c 100644
--- a/lbrynet/lbrynet_daemon/auth/server.py
+++ b/lbrynet/daemon/auth/server.py
@@ -15,8 +15,8 @@ from traceback import format_exc
from lbrynet import conf
from lbrynet.core.Error import InvalidAuthenticationToken
from lbrynet.core import utils
-from lbrynet.lbrynet_daemon.auth.util import APIKey, get_auth_message
-from lbrynet.lbrynet_daemon.auth.client import LBRY_SECRET
+from lbrynet.daemon.auth.util import APIKey, get_auth_message
+from lbrynet.daemon.auth.client import LBRY_SECRET
from lbrynet.undecorated import undecorated
log = logging.getLogger(__name__)
diff --git a/lbrynet/lbrynet_daemon/auth/util.py b/lbrynet/daemon/auth/util.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/auth/util.py
rename to lbrynet/daemon/auth/util.py
diff --git a/lbrynet/lbrynet_daemon/daemon_scripts/Autofetcher.py b/lbrynet/daemon/daemon_scripts/Autofetcher.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/daemon_scripts/Autofetcher.py
rename to lbrynet/daemon/daemon_scripts/Autofetcher.py
diff --git a/lbrynet/lbrynet_daemon/daemon_scripts/__init__.py b/lbrynet/daemon/daemon_scripts/__init__.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/daemon_scripts/__init__.py
rename to lbrynet/daemon/daemon_scripts/__init__.py
diff --git a/lbrynet/lbrynet_daemon/daemon_scripts/migrateto025.py b/lbrynet/daemon/daemon_scripts/migrateto025.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/daemon_scripts/migrateto025.py
rename to lbrynet/daemon/daemon_scripts/migrateto025.py
diff --git a/scripts/gen_api_docs.py b/scripts/gen_api_docs.py
index 055bb2bfc..b13cbf6e0 100644
--- a/scripts/gen_api_docs.py
+++ b/scripts/gen_api_docs.py
@@ -9,7 +9,7 @@ import os.path as op
import re
import sys
-from lbrynet.lbrynet_daemon.Daemon import Daemon
+from lbrynet.daemon.Daemon import Daemon
def _name(obj):
diff --git a/setup.py b/setup.py
index 094ed90c1..80c973cc9 100644
--- a/setup.py
+++ b/setup.py
@@ -35,8 +35,8 @@ requires = [
]
console_scripts = [
- 'lbrynet-daemon = lbrynet.lbrynet_daemon.DaemonControl:start',
- 'lbrynet-cli = lbrynet.lbrynet_daemon.DaemonCLI:main'
+ 'lbrynet-daemon = lbrynet.daemon.DaemonControl:start',
+ 'lbrynet-cli = lbrynet.daemon.DaemonCLI:main'
]
@@ -62,7 +62,6 @@ setup(
long_description=long_description,
keywords="lbry protocol media",
license='MIT',
-
packages=find_packages(base_dir, exclude=['tests']),
install_requires=requires,
entry_points={'console_scripts': console_scripts},
diff --git a/tests/mocks.py b/tests/mocks.py
index 63f451a23..5ef7d7a5c 100644
--- a/tests/mocks.py
+++ b/tests/mocks.py
@@ -6,7 +6,7 @@ from twisted.internet import defer
from lbrynet.core import PTCWallet
from lbrynet.core import BlobAvailability
-from lbrynet.lbrynet_daemon import ExchangeRateManager as ERM
+from lbrynet.daemon import ExchangeRateManager as ERM
from lbrynet import conf
KB = 2**10
diff --git a/tests/unit/lbrynet_daemon/auth/test_server.py b/tests/unit/lbrynet_daemon/auth/test_server.py
index 1e833d245..4e1cb9086 100644
--- a/tests/unit/lbrynet_daemon/auth/test_server.py
+++ b/tests/unit/lbrynet_daemon/auth/test_server.py
@@ -2,7 +2,7 @@ import mock
from twisted.trial import unittest
from tests.mocks import mock_conf_settings
-from lbrynet.lbrynet_daemon.auth import server
+from lbrynet.daemon.auth import server
class AuthJSONRPCServerTest(unittest.TestCase):
diff --git a/tests/unit/lbrynet_daemon/test_Daemon.py b/tests/unit/lbrynet_daemon/test_Daemon.py
index 3e4a741b5..d9bca0c0b 100644
--- a/tests/unit/lbrynet_daemon/test_Daemon.py
+++ b/tests/unit/lbrynet_daemon/test_Daemon.py
@@ -7,8 +7,8 @@ from twisted.trial import unittest
from lbryschema.decode import smart_decode
from lbrynet import conf
from lbrynet.core import Session, PaymentRateManager, Wallet
-from lbrynet.lbrynet_daemon.Daemon import Daemon as LBRYDaemon
-from lbrynet.lbrynet_daemon import ExchangeRateManager
+from lbrynet.daemon.Daemon import Daemon as LBRYDaemon
+from lbrynet.daemon import ExchangeRateManager
from tests import util
from tests.mocks import mock_conf_settings, FakeNetwork
diff --git a/tests/unit/lbrynet_daemon/test_DaemonCLI.py b/tests/unit/lbrynet_daemon/test_DaemonCLI.py
index fc1b2dcb8..1ee330d42 100644
--- a/tests/unit/lbrynet_daemon/test_DaemonCLI.py
+++ b/tests/unit/lbrynet_daemon/test_DaemonCLI.py
@@ -1,5 +1,5 @@
from twisted.trial import unittest
-from lbrynet.lbrynet_daemon import DaemonCLI
+from lbrynet.daemon import DaemonCLI
class DaemonCLITests(unittest.TestCase):
diff --git a/tests/unit/lbrynet_daemon/test_Downloader.py b/tests/unit/lbrynet_daemon/test_Downloader.py
index 836b363a0..9f6143479 100644
--- a/tests/unit/lbrynet_daemon/test_Downloader.py
+++ b/tests/unit/lbrynet_daemon/test_Downloader.py
@@ -7,13 +7,13 @@ from twisted.internet import defer
from lbryschema.claim import ClaimDict
from lbrynet.core import Session, PaymentRateManager, Wallet
-from lbrynet.lbrynet_daemon import Downloader
+from lbrynet.daemon import Downloader
from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier,StreamMetadata
from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
from lbrynet.core.HashBlob import TempBlob
from lbrynet.core.BlobManager import TempBlobManager
from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
-from lbrynet.lbrynet_daemon.ExchangeRateManager import ExchangeRateManager
+from lbrynet.daemon.ExchangeRateManager import ExchangeRateManager
from tests.mocks import BlobAvailabilityTracker as DummyBlobAvailabilityTracker
from tests.mocks import ExchangeRateManager as DummyExchangeRateManager
diff --git a/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py b/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py
index 9d3decbb0..f91a01ff6 100644
--- a/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py
+++ b/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py
@@ -1,5 +1,5 @@
from lbryschema.fee import Fee
-from lbrynet.lbrynet_daemon import ExchangeRateManager
+from lbrynet.daemon import ExchangeRateManager
from lbrynet.core.Error import InvalidExchangeRateResponse
from twisted.trial import unittest
From d9ced3c6f7ce897642651ac26509484db096bf21 Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Sun, 25 Jun 2017 21:23:10 -0400
Subject: [PATCH 09/13] convenient import for api client
---
lbrynet/daemon/__init__.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lbrynet/daemon/__init__.py b/lbrynet/daemon/__init__.py
index e69de29bb..7461e1c00 100644
--- a/lbrynet/daemon/__init__.py
+++ b/lbrynet/daemon/__init__.py
@@ -0,0 +1,3 @@
+from lbrynet.daemon.auth.client import LBRYAPIClient
+
+get_client = LBRYAPIClient.get_client
From 85cc843d3693db093aee6e280d47fc82da07dd36 Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Sun, 25 Jun 2017 21:23:48 -0400
Subject: [PATCH 10/13] initialize settings if necessary when configuring an
api client
---
lbrynet/daemon/auth/client.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lbrynet/daemon/auth/client.py b/lbrynet/daemon/auth/client.py
index ffe0eafa2..a0823936c 100644
--- a/lbrynet/daemon/auth/client.py
+++ b/lbrynet/daemon/auth/client.py
@@ -158,5 +158,7 @@ class AuthAPIClient(object):
class LBRYAPIClient(object):
@staticmethod
def get_client():
+ if not conf.settings:
+ conf.initialize_settings()
return AuthAPIClient.config() if conf.settings['use_auth_http'] else \
JSONRPCProxy.from_url(conf.settings.get_api_connection_string())
From efd46a9715e2cec9d1563218205c97c916584ff2 Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Sun, 25 Jun 2017 21:29:36 -0400
Subject: [PATCH 11/13] update changelog
---
CHANGELOG.md | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11e0ca8bf..627c3d5ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,11 +10,14 @@ at anytime.
## [Unreleased]
### Added
* Missing docstring for `blob_list`
- *
+ * Added convenient import for setting up a daemon client, `from lbrynet.daemon import get_client`
### Changed
* Change `max_key_fee` setting to be a dictionary with values for `currency` and `amount`
- *
+ * Renamed `lbrynet.lbryfile` to `lbrynet.lbry_file`
+ * Renamed `lbrynet.lbryfilemanager` to `lbrynet.file_manager`
+ * Renamed `lbrynet.lbrynet_daemon` to `lbrynet.daemon`
+ * Initialize lbrynet settings when configuring an api client if they are not set yet
### Fixed
* Fixed some log messages throwing exceptions
From 9743162cdaf1a21164e54956a4ab3f3289e7fcf7 Mon Sep 17 00:00:00 2001
From: hackrush <atulshyan96@gmail.com>
Date: Tue, 27 Jun 2017 21:30:48 +0530
Subject: [PATCH 12/13] Increased max_key_fee
The default max_key_fee value is increased to US$ 50.
Fixes #721
---
CHANGELOG.md | 1 +
lbrynet/conf.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 627c3d5ab..3462e7185 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ at anytime.
* Fix shutdown of the blob tracker by Session
* Fixed claim_new_support docstrings
* Fixed BlobManager causing functional tests to fail, removed its unneeded manage() loop
+ * Increased max_key_fee
### Deprecated
*
diff --git a/lbrynet/conf.py b/lbrynet/conf.py
index 20393d44b..6a960d11f 100644
--- a/lbrynet/conf.py
+++ b/lbrynet/conf.py
@@ -167,7 +167,7 @@ ADJUSTABLE_SETTINGS = {
'max_connections_per_stream': (int, 5),
# TODO: writing json on the cmd line is a pain, come up with a nicer
# parser for this data structure. maybe 'USD:25'
- 'max_key_fee': (json.loads, {'currency': 'USD', 'amount': 25.0}),
+ 'max_key_fee': (json.loads, {'currency': 'USD', 'amount': 50.0}),
'min_info_rate': (float, .02), # points/1000 infos
'min_valuable_hash_rate': (float, .05), # points/1000 infos
'min_valuable_info_rate': (float, .05), # points/1000 infos
From e71389c7e3229e20eab74390fd83cd0d685ac5ec Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Tue, 27 Jun 2017 17:52:58 -0400
Subject: [PATCH 13/13] update lbryum imports
---
CHANGELOG.md | 2 ++
lbrynet/core/Wallet.py | 5 +++--
lbrynet/core/system_info.py | 5 ++---
requirements.txt | 2 +-
setup.py | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3462e7185..c3d011807 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@ at anytime.
* Renamed `lbrynet.lbryfilemanager` to `lbrynet.file_manager`
* Renamed `lbrynet.lbrynet_daemon` to `lbrynet.daemon`
* Initialize lbrynet settings when configuring an api client if they are not set yet
+ * Updated lbryum imports
+ *
### Fixed
* Fixed some log messages throwing exceptions
diff --git a/lbrynet/core/Wallet.py b/lbrynet/core/Wallet.py
index 23b03d1e4..4bd5a6607 100644
--- a/lbrynet/core/Wallet.py
+++ b/lbrynet/core/Wallet.py
@@ -12,9 +12,10 @@ from collections import defaultdict, deque
from zope.interface import implements
from decimal import Decimal
-from lbryum import SimpleConfig, Network
-from lbryum.lbrycrd import COIN
import lbryum.wallet
+from lbryum.network import Network
+from lbryum.simple_config import SimpleConfig
+from lbryum.constants import COIN
from lbryum.commands import known_commands, Commands
from lbryschema.uri import parse_lbry_uri
diff --git a/lbrynet/core/system_info.py b/lbrynet/core/system_info.py
index cae4c231a..79187f722 100644
--- a/lbrynet/core/system_info.py
+++ b/lbrynet/core/system_info.py
@@ -4,11 +4,10 @@ import subprocess
import os
from urllib2 import urlopen
-
+from lbryschema import __version__ as lbryschema_version
+from lbryum import __version__ as LBRYUM_VERSION
from lbrynet import build_type, __version__ as lbrynet_version
from lbrynet.conf import ROOT_DIR
-from lbryum.version import LBRYUM_VERSION
-from lbryschema import __version__ as lbryschema_version
def get_lbrynet_version():
diff --git a/requirements.txt b/requirements.txt
index ff431058e..5b4fbec70 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ jsonrpc==1.2
jsonrpclib==0.1.7
jsonschema==2.5.1
git+https://github.com/lbryio/lbryschema.git@v0.0.7#egg=lbryschema
-git+https://github.com/lbryio/lbryum.git@v3.0.1#egg=lbryum
+git+https://github.com/lbryio/lbryum.git@v3.1.0#egg=lbryum
miniupnpc==1.9
pbkdf2==1.3
pycrypto==2.6.1
diff --git a/setup.py b/setup.py
index 80c973cc9..6eb4bfdf9 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ requires = [
'envparse',
'jsonrpc',
'jsonschema',
- 'lbryum==3.0.1',
+ 'lbryum==3.1.0',
'lbryschema==0.0.7',
'miniupnpc',
'pycrypto',