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

Move raw_header and electrum_header to session manager

Browse Source
This commit is contained in:
Neil Booth 2018-08-11 21:11:19 +09:00
parent f0f5aa3ee7
commit 429c6264f2
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
electrumx/server/session.py
View File

@ -508,6 +508,19 @@ class SessionManager(object):
except DaemonError as e: except DaemonError as e:
raise RPCError(DAEMON_ERROR, f'daemon error: {e!r}') from None raise RPCError(DAEMON_ERROR, f'daemon error: {e!r}') from None
async def raw_header(self, height):
'''Return the binary header at the given height.'''
try:
return await self.db.raw_header(height)
except IndexError:
raise RPCError(BAD_REQUEST, f'height {height:,d} '
'out of range') from None
async def electrum_header(self, height):
'''Return the deserialized header at the given height.'''
raw_header = await self.raw_header(height)
return self.env.coin.electrum_header(raw_header, height)
async def broadcast_transaction(self, raw_tx): async def broadcast_transaction(self, raw_tx):
hex_hash = await self.daemon.sendrawtransaction([raw_tx]) hex_hash = await self.daemon.sendrawtransaction([raw_tx])
self.txs_sent += 1 self.txs_sent += 1
@ -777,25 +790,12 @@ class ElectrumX(SessionBase):
if touched or (height_changed and self.mempool_statuses): if touched or (height_changed and self.mempool_statuses):
await self.notify_touched(touched) await self.notify_touched(touched)
async def raw_header(self, height):
'''Return the binary header at the given height.'''
try:
return await self.db.raw_header(height)
except IndexError:
raise RPCError(BAD_REQUEST, f'height {height:,d} '
'out of range') from None
async def electrum_header(self, height):
'''Return the deserialized header at the given height.'''
raw_header = await self.raw_header(height)
return self.coin.electrum_header(raw_header, height)
async def subscribe_headers_result(self, height): async def subscribe_headers_result(self, height):
'''The result of a header subscription for the given height.''' '''The result of a header subscription for the given height.'''
if self.subscribe_headers_raw: if self.subscribe_headers_raw:
raw_header = await self.raw_header(height) raw_header = await self.session_mgr.raw_header(height)
return {'hex': raw_header.hex(), 'height': height} return {'hex': raw_header.hex(), 'height': height}
return await self.electrum_header(height) return await self.session_mgr.electrum_header(height)
async def _headers_subscribe(self, raw): async def _headers_subscribe(self, raw):
'''Subscribe to get headers of new blocks.''' '''Subscribe to get headers of new blocks.'''
@ -978,7 +978,7 @@ class ElectrumX(SessionBase):
dictionary with a merkle proof.''' dictionary with a merkle proof.'''
height = non_negative_integer(height) height = non_negative_integer(height)
cp_height = non_negative_integer(cp_height) cp_height = non_negative_integer(cp_height)
raw_header_hex = (await self.raw_header(height)).hex() raw_header_hex = (await self.session_mgr.raw_header(height)).hex()
if cp_height == 0: if cp_height == 0:
return raw_header_hex return raw_header_hex
result = {'header': raw_header_hex} result = {'header': raw_header_hex}
@ -1029,7 +1029,7 @@ class ElectrumX(SessionBase):
height: the header's height''' height: the header's height'''
height = non_negative_integer(height) height = non_negative_integer(height)
return await self.electrum_header(height) return await self.session_mgr.electrum_header(height)
def is_tor(self): def is_tor(self):
'''Try to detect if the connection is to a tor hidden service we are '''Try to detect if the connection is to a tor hidden service we are