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

changed account list to use is_default instead of is_default_account and improved blockchain deamon port settings

Browse source
This commit is contained in:
Lex Berezhny 2019-04-06 15:27:58 -04:00
parent 9b21bd1a6f
commit f0c2d16749
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
torba/client/basemanager.py
View file

@ -45,7 +45,7 @@ class BaseWalletManager:
ledgers = {} ledgers = {}
for i, account in enumerate(self.accounts): for i, account in enumerate(self.accounts):
details = await account.get_details(**kwargs) details = await account.get_details(**kwargs)
details['is_default_account'] = i == 0 details['is_default'] = i == 0
ledger_id = account.ledger.get_id() ledger_id = account.ledger.get_id()
ledgers.setdefault(ledger_id, []) ledgers.setdefault(ledger_id, [])
ledgers[ledger_id].append(details) ledgers[ledger_id].append(details)

17
torba/orchstr8/node.py
View file

@ -263,14 +263,15 @@ class BlockchainNode:
self.protocol = None self.protocol = None
self.transport = None self.transport = None
self._block_expected = 0 self._block_expected = 0
self.hostname = 'localhost'
self.peerport = 9246 + 2 # avoid conflict with default peer port
self.rpcport = 9245 + 2 # avoid conflict with default rpc port
self.rpcuser = 'rpcuser' self.rpcuser = 'rpcuser'
self.rpcpassword = 'rpcpassword' self.rpcpassword = 'rpcpassword'
self.hostname = 'localhost'
self.port = 9245 + 1 # avoid conflict with default daemon
@property @property
def rpc_url(self): def rpc_url(self):
return f'http://{self.rpcuser}:{self.rpcpassword}@{self.hostname}:{self.port}/' return f'http://{self.rpcuser}:{self.rpcpassword}@{self.hostname}:{self.rpcport}/'
def is_expected_block(self, e: BlockHeightEvent): def is_expected_block(self, e: BlockHeightEvent):
return self._block_expected == e.height return self._block_expected == e.height
@ -322,9 +323,9 @@ class BlockchainNode:
asyncio.get_child_watcher().attach_loop(loop) asyncio.get_child_watcher().attach_loop(loop)
command = ( command = (
self.daemon_bin, self.daemon_bin,
'-datadir={}'.format(self.data_path), f'-datadir={self.data_path}', '-printtoconsole', '-regtest', '-server', '-txindex',
'-printtoconsole', '-regtest', '-server', '-txindex', f'-rpcuser={self.rpcuser}', f'-rpcpassword={self.rpcpassword}', f'-rpcport={self.rpcport}',
f'-rpcuser={self.rpcuser}', f'-rpcpassword={self.rpcpassword}', f'-rpcport={self.port}' f'-port={self.peerport}'
) )
self.log.info(' '.join(command)) self.log.info(' '.join(command))
self.transport, self.protocol = await loop.subprocess_exec( self.transport, self.protocol = await loop.subprocess_exec(
@ -346,8 +347,8 @@ class BlockchainNode:
async def _cli_cmnd(self, *args): async def _cli_cmnd(self, *args):
cmnd_args = [ cmnd_args = [
self.cli_bin, '-datadir={}'.format(self.data_path), '-regtest', self.cli_bin, f'-datadir={self.data_path}', '-regtest',
f'-rpcuser={self.rpcuser}', f'-rpcpassword={self.rpcpassword}', f'-rpcport={self.port}' f'-rpcuser={self.rpcuser}', f'-rpcpassword={self.rpcpassword}', f'-rpcport={self.rpcport}'
] + list(args) ] + list(args)
self.log.info(' '.join(cmnd_args)) self.log.info(' '.join(cmnd_args))
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()