From 9dd51467fe31b518b67e3ad94b543351886e3e2c Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Mon, 25 Nov 2019 20:03:08 -0300 Subject: [PATCH] move lbry specific version to its place --- lbry/lbry/wallet/network.py | 1 + torba/torba/client/basenetwork.py | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lbry/lbry/wallet/network.py b/lbry/lbry/wallet/network.py index df1d2c757..416478a8d 100644 --- a/lbry/lbry/wallet/network.py +++ b/lbry/lbry/wallet/network.py @@ -2,6 +2,7 @@ from torba.client.basenetwork import BaseNetwork class Network(BaseNetwork): + PROTOCOL_VERSION = '2.0' def get_claims_by_ids(self, claim_ids): return self.rpc('blockchain.claimtrie.getclaimsbyids', claim_ids) diff --git a/torba/torba/client/basenetwork.py b/torba/torba/client/basenetwork.py index caa37c683..7fc072357 100644 --- a/torba/torba/client/basenetwork.py +++ b/torba/torba/client/basenetwork.py @@ -13,8 +13,6 @@ log = logging.getLogger(__name__) class ClientSession(BaseClientSession): - PROTOCOL_VERSION = '2.0' - def __init__(self, *args, network, server, timeout=30, on_connect_callback=None, **kwargs): self.network = network self.server = server @@ -119,9 +117,9 @@ class ClientSession(BaseClientSession): self.trigger_urgent_reconnect.clear() async def ensure_server_version(self, required=None, timeout=3): + required = required or self.network.PROTOCOL_VERSION return await asyncio.wait_for( - self.send_request( - 'server.version', [__version__, required or self.PROTOCOL_VERSION]), timeout=timeout + self.send_request('server.version', [__version__, required]), timeout=timeout ) async def create_connection(self, timeout=6): @@ -145,6 +143,7 @@ class ClientSession(BaseClientSession): class BaseNetwork: + PROTOCOL_VERSION = '1.2' def __init__(self, ledger): self.config = ledger.config