RanchiMall/electrumx
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a counter for ID counting

Browse Source
This commit is contained in:
Neil Booth 2018-08-12 23:47:52 +09:00
parent 13a8b62d8c
commit 9ebd2e86e8
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
electrumx/server/daemon.py
View File

@ -9,6 +9,7 @@
daemon.''' daemon.'''
import asyncio import asyncio
import itertools
import json import json
import time import time
from calendar import timegm from calendar import timegm
@ -33,6 +34,7 @@ class Daemon(object):
WARMING_UP = -28 WARMING_UP = -28
RPC_MISC_ERROR = -1 RPC_MISC_ERROR = -1
id_counter = itertools.count()
class DaemonWarmingUpError(Exception): class DaemonWarmingUpError(Exception):
'''Raised when the daemon returns an error in its results.''' '''Raised when the daemon returns an error in its results.'''
@ -47,14 +49,8 @@ class Daemon(object):
self.workqueue_semaphore = asyncio.Semaphore(value=max_workqueue) self.workqueue_semaphore = asyncio.Semaphore(value=max_workqueue)
self.down = False self.down = False
self.last_error_time = 0 self.last_error_time = 0
self.req_id = 0
self._available_rpcs = {} # caches results for _is_rpc_available() self._available_rpcs = {} # caches results for _is_rpc_available()
def next_req_id(self):
'''Retrns the next request ID.'''
self.req_id += 1
return self.req_id
def set_urls(self, urls): def set_urls(self, urls):
'''Set the URLS to the given list, and switch to the first one.''' '''Set the URLS to the given list, and switch to the first one.'''
if not urls: if not urls:
@ -162,7 +158,7 @@ class Daemon(object):
raise self.DaemonWarmingUpError raise self.DaemonWarmingUpError
raise DaemonError(err) raise DaemonError(err)
payload = {'method': method, 'id': self.next_req_id()} payload = {'method': method, 'id': next(self.id_counter)}
if params: if params:
payload['params'] = params payload['params'] = params
return await self._send(payload, processor) return await self._send(payload, processor)
@ -181,7 +177,7 @@ class Daemon(object):
return [item['result'] for item in result] return [item['result'] for item in result]
raise DaemonError(errs) raise DaemonError(errs)
payload = [{'method': method, 'params': p, 'id': self.next_req_id()} payload = [{'method': method, 'params': p, 'id': next(self.id_counter)}
for p in params_iterable] for p in params_iterable]
if payload: if payload:
return await self._send(payload, processor) return await self._send(payload, processor)