From 7d5dd1ff51ef9a50a13f8c437ccefbf76831db7e Mon Sep 17 00:00:00 2001 From: Kay Kurokawa Date: Wed, 28 Dec 2016 14:34:38 -0500 Subject: [PATCH 1/2] fix bug in ServerProtocol --- lbrynet/core/server/ServerProtocol.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lbrynet/core/server/ServerProtocol.py b/lbrynet/core/server/ServerProtocol.py index b88ffe0ba..5ad9b2039 100644 --- a/lbrynet/core/server/ServerProtocol.py +++ b/lbrynet/core/server/ServerProtocol.py @@ -33,10 +33,9 @@ class ServerProtocol(Protocol): peer_info = self.transport.getPeer() self.peer = self.factory.peer_manager.get_peer(peer_info.host, peer_info.port) self.request_handler = ServerRequestHandler(self) - for query_handler_factory, enabled in self.factory.query_handler_factories.iteritems(): - if enabled is True: - query_handler = query_handler_factory.build_query_handler() - query_handler.register_with_request_handler(self.request_handler, self.peer) + for query_handler_factory in self.factory.query_handler_factories.values(): + query_handler = query_handler_factory.build_query_handler() + query_handler.register_with_request_handler(self.request_handler, self.peer) log.debug("Setting the request handler") self.factory.rate_limiter.register_protocol(self) From 22ff87b885662cfa18ed58dca93f3181d9daf7fe Mon Sep 17 00:00:00 2001 From: Job Evers-Meltzer Date: Fri, 30 Dec 2016 09:07:24 -0600 Subject: [PATCH 2/2] fix tests for new query_handler_factory format --- tests/functional/test_misc.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/functional/test_misc.py b/tests/functional/test_misc.py index 0729af819..f1cdb1cae 100644 --- a/tests/functional/test_misc.py +++ b/tests/functional/test_misc.py @@ -149,12 +149,12 @@ class LbryUploader(object): def start_server(self): session = self.session query_handler_factories = { - BlobAvailabilityHandlerFactory(session.blob_manager): True, - BlobRequestHandlerFactory( + 1: BlobAvailabilityHandlerFactory(session.blob_manager), + 2: BlobRequestHandlerFactory( session.blob_manager, session.wallet, session.payment_rate_manager, - analytics.Track()): True, - session.wallet.get_wallet_info_query_handler_factory(): True, + analytics.Track()), + 3: session.wallet.get_wallet_info_query_handler_factory(), } server_factory = ServerProtocolFactory(session.rate_limiter, query_handler_factories, @@ -266,12 +266,12 @@ def start_lbry_reuploader(sd_hash, kill_event, dead_event, server_port = None query_handler_factories = { - BlobAvailabilityHandlerFactory(session.blob_manager): True, - BlobRequestHandlerFactory( + 1: BlobAvailabilityHandlerFactory(session.blob_manager), + 2: BlobRequestHandlerFactory( session.blob_manager, session.wallet, session.payment_rate_manager, - analytics.Track()): True, - session.wallet.get_wallet_info_query_handler_factory(): True, + analytics.Track()), + 3: session.wallet.get_wallet_info_query_handler_factory(), } server_factory = ServerProtocolFactory(session.rate_limiter, @@ -342,12 +342,12 @@ def start_live_server(sd_hash_queue, kill_event, dead_event): def start_listening(): logging.debug("Starting the server protocol") query_handler_factories = { - CryptBlobInfoQueryHandlerFactory(stream_info_manager, session.wallet, - session.payment_rate_manager): True, - BlobRequestHandlerFactory(session.blob_manager, session.wallet, + 1: CryptBlobInfoQueryHandlerFactory(stream_info_manager, session.wallet, + session.payment_rate_manager), + 2: BlobRequestHandlerFactory(session.blob_manager, session.wallet, session.payment_rate_manager, - analytics.Track()): True, - session.wallet.get_wallet_info_query_handler_factory(): True, + analytics.Track()), + 3: session.wallet.get_wallet_info_query_handler_factory() } server_factory = ServerProtocolFactory(session.rate_limiter, @@ -483,11 +483,11 @@ def start_blob_uploader(blob_hash_queue, kill_event, dead_event, slow, is_genero server_port = None query_handler_factories = { - BlobAvailabilityHandlerFactory(session.blob_manager): True, - BlobRequestHandlerFactory(session.blob_manager, session.wallet, + 1: BlobAvailabilityHandlerFactory(session.blob_manager), + 2: BlobRequestHandlerFactory(session.blob_manager, session.wallet, session.payment_rate_manager, - analytics.Track()): True, - session.wallet.get_wallet_info_query_handler_factory(): True, + analytics.Track()), + 3: session.wallet.get_wallet_info_query_handler_factory(), } server_factory = ServerProtocolFactory(session.rate_limiter,