protocol.py: minor cleanups

This commit is contained in:
The MMGen Project 2021-08-02 19:47:41 +00:00
commit e24b3510dc
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
2 changed files with 6 additions and 8 deletions

View file

@ -67,7 +67,7 @@ def _b58chk_decode(s):
raise ValueError('_b58chk_decode(): incorrect checksum')
return out[:-4]
finfo = namedtuple('fork_info',['height','hash','name','replayable'])
_finfo = namedtuple('fork_info',['height','hash','name','replayable'])
class CoinProtocol(MMGenObject):
@ -81,7 +81,7 @@ class CoinProtocol(MMGenObject):
'zec': proto_info('Zcash', 2),
'xmr': proto_info('Monero', 4)
}
core_coins = tuple(coins.keys()) # coins may be added by init_genonly_altcoins(), so save
core_coins = tuple(coins) # coins may be added by init_genonly_altcoins(), so save
class Base(MMGenObject):
base_proto = None
@ -214,8 +214,8 @@ class CoinProtocol(MMGenObject):
sighash_type = 'ALL'
block0 = '000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f'
forks = [
finfo(478559,'00000000000000000019f112ec0a9982926f1258cdcc558dd7c3b7e5dc7fa148','BCH',False),
finfo(None,'','B2X',True),
_finfo(478559,'00000000000000000019f112ec0a9982926f1258cdcc558dd7c3b7e5dc7fa148','BCH',False),
_finfo(None,'','B2X',True),
]
caps = ('rbf','segwit')
mmcaps = ('key','addr','rpc','tx')
@ -307,11 +307,10 @@ class CoinProtocol(MMGenObject):
class BitcoinCash(Bitcoin):
is_fork_of = 'Bitcoin'
# TODO: assumes MSWin user installs in custom dir 'Bitcoin_ABC'
mmtypes = ('L','C')
sighash_type = 'ALL|FORKID'
forks = [
finfo(478559,'000000000000000000651ef99cb9fcbe0dadde1d424bd9f15ff20136191a5eec','BTC',False)
_finfo(478559,'000000000000000000651ef99cb9fcbe0dadde1d424bd9f15ff20136191a5eec','BTC',False)
]
caps = ()
coin_amt = BCHAmt
@ -333,7 +332,7 @@ class CoinProtocol(MMGenObject):
coin_amt = B2XAmt
max_tx_fee = B2XAmt('0.1')
forks = [
finfo(None,'','BTC',True) # activation: 494784
_finfo(None,'','BTC',True) # activation: 494784
]
ignore_daemon_version = False

View file

@ -117,7 +117,6 @@ class MMGenRegtest(MMGenObject):
await self.rpc_call('stop')
def init_daemon(self,reindex=False):
self.d.desc = f'{self.d.coind_name} regtest daemon'
if reindex:
self.d.usr_coind_args.append('--reindex')