From 97e6e1684ecf26a97594f502f9d7c8bcb22037cb Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Wed, 3 Mar 2021 22:14:48 -0500 Subject: [PATCH] simplifying --- lbry/extras/daemon/daemon.py | 26 ++++++------------- .../blockchain/test_claim_commands.py | 6 ++--- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/lbry/extras/daemon/daemon.py b/lbry/extras/daemon/daemon.py index 21ebeddff..6cb2eeba7 100644 --- a/lbry/extras/daemon/daemon.py +++ b/lbry/extras/daemon/daemon.py @@ -3696,7 +3696,7 @@ class Daemon(metaclass=JSONRPCServerType): COLLECTION_DOC = """ Create, update, list, resolve, and abandon collections. """ - #| --claims = < claims > + @requires(WALLET_COMPONENT) async def jsonrpc_collection_create( self, name, bid, claims, allow_duplicate_name=False, @@ -3993,8 +3993,9 @@ class Daemon(metaclass=JSONRPCServerType): return await self.jsonrpc_stream_abandon(*args, **kwargs) @requires(WALLET_COMPONENT) - def jsonrpc_collection_list(self, resolve_claims=0, resolve=False, - account_id=None, wallet_id=None, page=None, page_size=None): + def jsonrpc_collection_list( + self, resolve_claims=0, resolve=False, account_id=None, + wallet_id=None, page=None, page_size=None): """ List my collection claims. @@ -4015,23 +4016,12 @@ class Daemon(metaclass=JSONRPCServerType): wallet = self.wallet_manager.get_wallet_or_default(wallet_id) if account_id: account = wallet.get_account_or_error(account_id) - collections = partial( - self.ledger.get_collections, - wallet=wallet, - accounts=[account], - resolve=resolve) + collections = account.get_collections collection_count = account.get_collection_count else: - collections = partial( - self.ledger.get_collections, - wallet=wallet, - accounts=wallet.accounts, - resolve=resolve) - collection_count = partial( - self.ledger.get_collection_count, - wallet=wallet, - accounts=wallet.accounts) - return paginate_rows(collections, collection_count, page, page_size, resolve_claims=resolve_claims) + collections = partial(self.ledger.get_collections, wallet=wallet, accounts=wallet.accounts) + collection_count = partial(self.ledger.get_collection_count, wallet=wallet, accounts=wallet.accounts) + return paginate_rows(collections, collection_count, page, page_size, resolve=resolve, resolve_claims=resolve_claims) async def jsonrpc_collection_resolve( self, claim_id=None, url=None, wallet_id=None, page=1, page_size=DEFAULT_PAGE_SIZE): diff --git a/tests/integration/blockchain/test_claim_commands.py b/tests/integration/blockchain/test_claim_commands.py index 1906d4df4..ac69ced58 100644 --- a/tests/integration/blockchain/test_claim_commands.py +++ b/tests/integration/blockchain/test_claim_commands.py @@ -2029,10 +2029,10 @@ class CollectionCommands(CommandTestCase): await self.collection_update(claim_id, clear_claims=True, claims=claim_ids[:2]) collections = await self.out(self.daemon.jsonrpc_collection_list()) self.assertEquals(len(collections['items']), 2) + self.assertNotIn('canonical_url', collections['items'][0]) - # resolve flag resolves collection claim - resolved_collections_tx = await self.out(self.daemon.jsonrpc_collection_list(resolve=True)) - self.assertIn('canonical_url', resolved_collections_tx[0]) + resolved_collections = await self.out(self.daemon.jsonrpc_collection_list(resolve=True)) + self.assertIn('canonical_url', resolved_collections['items'][0]) await self.collection_abandon(claim_id) self.assertItemCount(await self.daemon.jsonrpc_collection_list(), 1)