Merge remote-tracking branch 'origin/fix_prm'

This commit is contained in:
Jack Robison 2018-06-08 13:50:23 -04:00
commit a1218ea565
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
2 changed files with 3 additions and 3 deletions

View file

@ -13,6 +13,7 @@ at anytime.
* *
### Fixed ### Fixed
* fix prm/brm typo
* handling error from dht clients with old `ping` method * handling error from dht clients with old `ping` method
* blobs not being re-announced if no peers successfully stored, now failed announcements are re-queued * blobs not being re-announced if no peers successfully stored, now failed announcements are re-queued
* issue where an `AuthAPIClient` (used by `lbrynet-cli`) would fail to update its session secret and keep making new auth sessions, with every other request failing * issue where an `AuthAPIClient` (used by `lbrynet-cli`) would fail to update its session secret and keep making new auth sessions, with every other request failing

View file

@ -117,13 +117,12 @@ class EncryptedFileManager(object):
def _start_lbry_files(self): def _start_lbry_files(self):
files = yield self.session.storage.get_all_lbry_files() files = yield self.session.storage.get_all_lbry_files()
claim_infos = yield self.session.storage.get_claims_from_stream_hashes([file['stream_hash'] for file in files]) claim_infos = yield self.session.storage.get_claims_from_stream_hashes([file['stream_hash'] for file in files])
b_prm = self.session.base_payment_rate_manager prm = self.session.payment_rate_manager
# payment_rate_manager = NegotiatedPaymentRateManager(b_prm, self.session.blob_tracker)
log.info("Starting %i files", len(files)) log.info("Starting %i files", len(files))
for file_info in files: for file_info in files:
claim_info = claim_infos.get(file_info['stream_hash']) claim_info = claim_infos.get(file_info['stream_hash'])
self._start_lbry_file(file_info, b_prm, claim_info) self._start_lbry_file(file_info, prm, claim_info)
log.info("Started %i lbry files", len(self.lbry_files)) log.info("Started %i lbry files", len(self.lbry_files))
if self.auto_re_reflect is True: if self.auto_re_reflect is True: