LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

move lbry specific version to its place

Browse source
This commit is contained in:
Victor Shyba 2019-11-25 20:03:08 -03:00 committed by Lex Berezhny
parent cec6dca72f
commit 9dd51467fe
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lbry/lbry/wallet/network.py
View file

@ -2,6 +2,7 @@ from torba.client.basenetwork import BaseNetwork
class Network(BaseNetwork): class Network(BaseNetwork):
PROTOCOL_VERSION = '2.0'
def get_claims_by_ids(self, claim_ids): def get_claims_by_ids(self, claim_ids):
return self.rpc('blockchain.claimtrie.getclaimsbyids', claim_ids) return self.rpc('blockchain.claimtrie.getclaimsbyids', claim_ids)

7
torba/torba/client/basenetwork.py
View file

@ -13,8 +13,6 @@ log = logging.getLogger(__name__)
class ClientSession(BaseClientSession): class ClientSession(BaseClientSession):
PROTOCOL_VERSION = '2.0'
def __init__(self, *args, network, server, timeout=30, on_connect_callback=None, **kwargs): def __init__(self, *args, network, server, timeout=30, on_connect_callback=None, **kwargs):
self.network = network self.network = network
self.server = server self.server = server
@ -119,9 +117,9 @@ class ClientSession(BaseClientSession):
self.trigger_urgent_reconnect.clear() self.trigger_urgent_reconnect.clear()
async def ensure_server_version(self, required=None, timeout=3): async def ensure_server_version(self, required=None, timeout=3):
required = required or self.network.PROTOCOL_VERSION
return await asyncio.wait_for( return await asyncio.wait_for(
self.send_request( self.send_request('server.version', [__version__, required]), timeout=timeout
'server.version', [__version__, required or self.PROTOCOL_VERSION]), timeout=timeout
) )
async def create_connection(self, timeout=6): async def create_connection(self, timeout=6):
@ -145,6 +143,7 @@ class ClientSession(BaseClientSession):
class BaseNetwork: class BaseNetwork:
PROTOCOL_VERSION = '1.2'
def __init__(self, ledger): def __init__(self, ledger):
self.config = ledger.config self.config = ledger.config