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

merge conflicts

Browse source
This commit is contained in:
Jack Robison 2021-08-09 21:04:42 -04:00 committed by Victor Shyba
parent c819d494c3
commit 91a86fd12f
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lbry/wallet/server/session.py
View file

@ -987,6 +987,11 @@ class LBRYElectrumX(SessionBase):
except ConnectionTimeout: except ConnectionTimeout:
self.session_mgr.interrupt_count_metric.inc() self.session_mgr.interrupt_count_metric.inc()
raise RPCError(JSONRPC.QUERY_TIMEOUT, 'query timed out') raise RPCError(JSONRPC.QUERY_TIMEOUT, 'query timed out')
except TooManyClaimSearchParametersError as err:
await asyncio.sleep(2)
self.logger.warning("Got an invalid query from %s, for %s with more than %d elements.",
self.peer_address()[0], err.key, err.limit)
return RPCError(1, str(err))
finally: finally:
self.session_mgr.pending_query_metric.dec() self.session_mgr.pending_query_metric.dec()
self.session_mgr.executor_time_metric.observe(time.perf_counter() - start) self.session_mgr.executor_time_metric.observe(time.perf_counter() - start)

14
tests/integration/blockchain/test_wallet_server_sessions.py
View file

@ -196,13 +196,13 @@ class TestHubDiscovery(CommandTestCase):
class TestStressFlush(CommandTestCase): class TestStressFlush(CommandTestCase):
# async def test_flush_over_66_thousand(self): # async def test_flush_over_66_thousand(self):
# history = self.conductor.spv_node.server.db.history # history = self.conductor.spv_node.server.db.history
# history.flush_count = 66_000 # history.flush_count = 66_000
# history.flush() # history.flush()
# self.assertEqual(history.flush_count, 66_001) # self.assertEqual(history.flush_count, 66_001)
# await self.generate(1) # await self.generate(1)
# self.assertEqual(history.flush_count, 66_002) # self.assertEqual(history.flush_count, 66_002)
async def test_thousands_claim_ids_on_search(self): async def test_thousands_claim_ids_on_search(self):
await self.stream_create() await self.stream_create()