fix rebase

lbry/wallet/ledger.py

@@ -770,18 +770,13 @@ class Ledger(metaclass=LedgerRegistry):
             include_is_my_output=False,
             include_sent_supports=False,
             include_sent_tips=False,
-            include_received_tips=False,
-            session_override=None) -> Tuple[List[Output], dict, int, int]:
+            include_received_tips=False) -> Tuple[List[Output], dict, int, int]:
         encoded_outputs = await query
         outputs = Outputs.from_base64(encoded_outputs or b'')  # TODO: why is the server returning None?
-        txs = []
-        if len(outputs.txs) > 0:
         txs: List[Transaction] = []
-            if session_override:
-                async for tx in self.request_transactions(tuple(outputs.txs), session_override):
+        if len(outputs.txs) > 0:
+            async for tx in self.request_transactions(tuple(outputs.txs)):
                 txs.append(tx)
-            else:
-                txs.extend((await asyncio.gather(*(self.cache_transaction(*tx) for tx in outputs.txs))))
 
         _txos, blocked = outputs.inflate(txs)
 
@@ -856,25 +851,17 @@ class Ledger(metaclass=LedgerRegistry):
     async def resolve(self, accounts, urls, new_sdk_server=None, **kwargs):
         txos = []
         urls_copy = list(urls)
-
         if new_sdk_server:
             resolve = partial(self.network.new_resolve, new_sdk_server)
+        else:
+            resolve = partial(self.network.retriable_call, self.network.resolve)
         while urls_copy:
-                batch, urls_copy = urls_copy[:500], urls_copy[500:]
+            batch, urls_copy = urls_copy[:100], urls_copy[100:]
             txos.extend(
                 (await self._inflate_outputs(
                     resolve(batch), accounts, **kwargs
                 ))[0]
             )
-        else:
-            async with self.network.single_call_context(self.network.resolve) as (resolve, session):
-                while urls_copy:
-                    batch, urls_copy = urls_copy[:500], urls_copy[500:]
-                    txos.extend(
-                        (await self._inflate_outputs(
-                            resolve(batch), accounts, session_override=session, **kwargs
-                        ))[0]
-                    )
 
         assert len(urls) == len(txos), "Mismatch between urls requested for resolve and responses received."
         result = {}
@@ -896,17 +883,13 @@ class Ledger(metaclass=LedgerRegistry):
             new_sdk_server=None, **kwargs) -> Tuple[List[Output], dict, int, int]:
         if new_sdk_server:
             claim_search = partial(self.network.new_claim_search, new_sdk_server)
+        else:
+            claim_search = self.network.claim_search
         return await self._inflate_outputs(
             claim_search(**kwargs), accounts,
             include_purchase_receipt=include_purchase_receipt,
             include_is_my_output=include_is_my_output,
         )
-        async with self.network.single_call_context(self.network.claim_search) as (claim_search, session):
-            return await self._inflate_outputs(
-                claim_search(**kwargs), accounts, session_override=session,
-                include_purchase_receipt=include_purchase_receipt,
-                include_is_my_output=include_is_my_output,
-            )
 
     async def get_claim_by_claim_id(self, accounts, claim_id, **kwargs) -> Output:
         for claim in (await self.claim_search(accounts, claim_id=claim_id, **kwargs))[0]:
@@ -1187,7 +1170,6 @@ class Ledger(metaclass=LedgerRegistry):
                     result[key] += value
         return result
 
-
 class TestNetLedger(Ledger):
     network_name = 'testnet'
     pubkey_address_prefix = bytes((111,))
@@ -1196,7 +1178,6 @@ class TestNetLedger(Ledger):
     extended_private_key_prefix = unhexlify('04358394')
     checkpoints = {}
 
-
 class RegTestLedger(Ledger):
     network_name = 'regtest'
     headers_class = UnvalidatedHeaders

lbry/wallet/network.py

@@ -260,9 +260,9 @@ class Network:
         restricted = known_height in (None, -1, 0) or 0 > known_height > self.remote_height - 10
         return self.rpc('blockchain.transaction.get', [tx_hash], restricted)
 
-    def get_transaction_batch(self, txids, restricted=True, session=None):
+    def get_transaction_batch(self, txids, restricted=True):
         # use any server if its old, otherwise restrict to who gave us the history
-        return self.rpc('blockchain.transaction.get_batch', txids, restricted, session)
+        return self.rpc('blockchain.transaction.get_batch', txids, restricted)
 
     def get_transaction_and_merkle(self, tx_hash, known_height=None):
         # use any server if its old, otherwise restrict to who gave us the history