Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

disable NegotiatedPaymentRateManager, use OnlyFreePaymentsManager for now

Browse source
This commit is contained in:
Jack Robison 2018-05-23 16:51:25 -04:00
parent 4bd9f3bd68
commit b673c508cc
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
3 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lbrynet/core/PaymentRateManager.py
View file

@ -93,6 +93,7 @@ class OnlyFreePaymentsManager(object):
self.base = BasePaymentRateManager(0.0, 0.0) self.base = BasePaymentRateManager(0.0, 0.0)
self.points_paid = 0.0 self.points_paid = 0.0
self.min_blob_data_payment_rate = 0.0
self.generous = True self.generous = True
self.strategy = OnlyFreeStrategy() self.strategy = OnlyFreeStrategy()

34
lbrynet/core/Session.py
View file

@ -6,7 +6,7 @@ from lbrynet.dht import node, hashannouncer
from lbrynet.database.storage import SQLiteStorage from lbrynet.database.storage import SQLiteStorage
from lbrynet.core.RateLimiter import RateLimiter from lbrynet.core.RateLimiter import RateLimiter
from lbrynet.core.utils import generate_id from lbrynet.core.utils import generate_id
from lbrynet.core.PaymentRateManager import BasePaymentRateManager, NegotiatedPaymentRateManager from lbrynet.core.PaymentRateManager import BasePaymentRateManager, OnlyFreePaymentsManager
from lbrynet.core.BlobAvailability import BlobAvailabilityTracker from lbrynet.core.BlobAvailability import BlobAvailabilityTracker
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -107,8 +107,8 @@ class Session(object):
self.known_dht_nodes = [] self.known_dht_nodes = []
self.blob_dir = blob_dir self.blob_dir = blob_dir
self.blob_manager = blob_manager self.blob_manager = blob_manager
self.blob_tracker = None # self.blob_tracker = None
self.blob_tracker_class = blob_tracker_class or BlobAvailabilityTracker # self.blob_tracker_class = blob_tracker_class or BlobAvailabilityTracker
self.peer_port = peer_port self.peer_port = peer_port
self.use_upnp = use_upnp self.use_upnp = use_upnp
self.rate_limiter = rate_limiter self.rate_limiter = rate_limiter
@ -118,9 +118,9 @@ class Session(object):
self.dht_node_class = dht_node_class self.dht_node_class = dht_node_class
self.dht_node = None self.dht_node = None
self.base_payment_rate_manager = BasePaymentRateManager(blob_data_payment_rate) self.base_payment_rate_manager = BasePaymentRateManager(blob_data_payment_rate)
self.payment_rate_manager = None self.payment_rate_manager = OnlyFreePaymentsManager()
self.payment_rate_manager_class = payment_rate_manager_class or NegotiatedPaymentRateManager # self.payment_rate_manager_class = payment_rate_manager_class or NegotiatedPaymentRateManager
self.is_generous = is_generous # self.is_generous = is_generous
self.storage = storage or SQLiteStorage(self.db_dir) self.storage = storage or SQLiteStorage(self.db_dir)
self._join_dht_deferred = None self._join_dht_deferred = None
@ -147,8 +147,8 @@ class Session(object):
ds = [] ds = []
if self.hash_announcer: if self.hash_announcer:
self.hash_announcer.stop() self.hash_announcer.stop()
if self.blob_tracker is not None: # if self.blob_tracker is not None:
ds.append(defer.maybeDeferred(self.blob_tracker.stop)) # ds.append(defer.maybeDeferred(self.blob_tracker.stop))
if self.dht_node is not None: if self.dht_node is not None:
ds.append(defer.maybeDeferred(self.dht_node.stop)) ds.append(defer.maybeDeferred(self.dht_node.stop))
if self.rate_limiter is not None: if self.rate_limiter is not None:
@ -251,19 +251,19 @@ class Session(object):
else: else:
self.blob_manager = DiskBlobManager(self.blob_dir, self.storage) self.blob_manager = DiskBlobManager(self.blob_dir, self.storage)
if self.blob_tracker is None: # if self.blob_tracker is None:
self.blob_tracker = self.blob_tracker_class( # self.blob_tracker = self.blob_tracker_class(
self.blob_manager, self.dht_node.peer_finder, self.dht_node # self.blob_manager, self.dht_node.peer_finder, self.dht_node
) # )
if self.payment_rate_manager is None: # if self.payment_rate_manager is None:
self.payment_rate_manager = self.payment_rate_manager_class( # self.payment_rate_manager = self.payment_rate_manager_class(
self.base_payment_rate_manager, self.blob_tracker, self.is_generous # self.base_payment_rate_manager, self.blob_tracker, self.is_generous
) # )
self.rate_limiter.start() self.rate_limiter.start()
d = self.blob_manager.setup() d = self.blob_manager.setup()
d.addCallback(lambda _: self.wallet.start()) d.addCallback(lambda _: self.wallet.start())
d.addCallback(lambda _: self.blob_tracker.start()) # d.addCallback(lambda _: self.blob_tracker.start())
return d return d
def _unset_upnp(self): def _unset_upnp(self):

6
lbrynet/file_manager/EncryptedFileManager.py
View file

@ -7,7 +7,7 @@ import logging
from twisted.internet import defer, task, reactor from twisted.internet import defer, task, reactor
from twisted.python.failure import Failure from twisted.python.failure import Failure
from lbrynet.reflector.reupload import reflect_file from lbrynet.reflector.reupload import reflect_file
from lbrynet.core.PaymentRateManager import NegotiatedPaymentRateManager # from lbrynet.core.PaymentRateManager import NegotiatedPaymentRateManager
from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloader from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
from lbrynet.core.StreamDescriptor import EncryptedFileStreamType, get_sd_info from lbrynet.core.StreamDescriptor import EncryptedFileStreamType, get_sd_info
@ -118,12 +118,12 @@ class EncryptedFileManager(object):
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 b_prm = self.session.base_payment_rate_manager
payment_rate_manager = NegotiatedPaymentRateManager(b_prm, self.session.blob_tracker) # 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, payment_rate_manager, claim_info) self._start_lbry_file(file_info, b_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: