Merge branch 'update-tip-history'

This commit is contained in:
Jack Robison 2017-09-20 09:54:51 -04:00
commit a04fe638b8
No known key found for this signature in database
GPG key ID: 284699E7404E3CFF
2 changed files with 4 additions and 1 deletions

View file

@ -14,6 +14,7 @@ at anytime.
### Fixed ### Fixed
* Fixed `transaction_list` doc string * Fixed `transaction_list` doc string
* Fixed ([in lbryum](https://github.com/lbryio/lbryum/pull/156)) batched queries responsible for making transaction and tip histories slow
* *
### Deprecated ### Deprecated

View file

@ -1457,7 +1457,9 @@ class LBRYumWallet(Wallet):
return self._run_cmd_as_defer_to_thread('getclaimtrie') return self._run_cmd_as_defer_to_thread('getclaimtrie')
def _get_history(self, include_tip_info): def _get_history(self, include_tip_info):
return self._run_cmd_as_defer_succeed('history', include_tip_info) if include_tip_info:
return self._run_cmd_as_defer_succeed('tiphistory')
return self._run_cmd_as_defer_succeed('claimhistory')
def _address_is_mine(self, address): def _address_is_mine(self, address):
return self._run_cmd_as_defer_succeed('ismine', address) return self._run_cmd_as_defer_succeed('ismine', address)