From a53f5674507152b4d78c5554f3c8f905243f150c Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Wed, 11 Oct 2023 12:58:50 +0000 Subject: [PATCH] pylint throughout (excluding tests) - bugfixes --- mmgen/addrgen.py | 4 ++-- mmgen/contrib/keccak.py | 2 +- mmgen/fileutil.py | 2 +- mmgen/proto/btc/regtest.py | 2 +- mmgen/proto/btc/tw/ctl.py | 2 +- mmgen/proto/eth/daemon.py | 5 +++-- mmgen/proto/eth/tx/unsigned.py | 2 +- mmgen/protocol.py | 2 +- mmgen/tx/sign.py | 4 ++-- mmgen/wallet/seed.py | 2 +- 10 files changed, 14 insertions(+), 13 deletions(-) diff --git a/mmgen/addrgen.py b/mmgen/addrgen.py index c0578536..e5865d8e 100755 --- a/mmgen/addrgen.py +++ b/mmgen/addrgen.py @@ -40,7 +40,7 @@ class addr_generator: self.proto = proto self.pubkey_type = addr_type.pubkey_type self.compressed = addr_type.compressed - desc = f'AddrGenerator {type(self).__name__!r}' + self.desc = f'AddrGenerator {type(self).__name__!r}' class keccak(base): @@ -71,7 +71,7 @@ def AddrGenerator(cfg,proto,addr_type): elif type(addr_type) is MMGenAddrType: assert addr_type in proto.mmtypes, f'{addr_type}: invalid address type for coin {proto.coin}' else: - raise TypeError(f'{type(addr_type)}: incorrect argument type for {cls.__name__}()') + raise TypeError(f"{type(addr_type)}: incorrect argument type for 'addr_type' arg") import importlib return getattr( diff --git a/mmgen/contrib/keccak.py b/mmgen/contrib/keccak.py index 5cba4b5b..5c82505a 100755 --- a/mmgen/contrib/keccak.py +++ b/mmgen/contrib/keccak.py @@ -133,7 +133,7 @@ class KeccakState: return '%016x' % x for y in KeccakState.rangeH: row = [] - for x in rangeW: + for x in KeccakState.rangeW: row.append(fmt(st[x][y])) rows.append(' '.join(row)) return '\n'.join(rows) diff --git a/mmgen/fileutil.py b/mmgen/fileutil.py index 7e49db28..8efafc0e 100755 --- a/mmgen/fileutil.py +++ b/mmgen/fileutil.py @@ -312,7 +312,7 @@ def get_data_from_file( if len(data) == cfg.max_input_size + 1: die( 'MaxInputSizeExceeded', - f'Too much input data! Max input data size: {f.max_input_size} bytes' ) + f'Too much input data! Max input data size: {cfg.max_input_size} bytes' ) return data diff --git a/mmgen/proto/btc/regtest.py b/mmgen/proto/btc/regtest.py index 861b26e3..219da137 100755 --- a/mmgen/proto/btc/regtest.py +++ b/mmgen/proto/btc/regtest.py @@ -38,7 +38,7 @@ def create_data_dir(cfg,data_dir): f'Delete your existing MMGen regtest setup at {data_dir!r} and create a new one?'): shutil.rmtree(data_dir) else: - die() + die(1,'Exiting') try: os.makedirs(data_dir) diff --git a/mmgen/proto/btc/tw/ctl.py b/mmgen/proto/btc/tw/ctl.py index dd082b6e..e25c7b22 100755 --- a/mmgen/proto/btc/tw/ctl.py +++ b/mmgen/proto/btc/tw/ctl.py @@ -84,7 +84,7 @@ class BitcoinTwCtl(TwCtl): if endless: tip = await self.rpc.call('getblockcount') while last_block < tip: - last_block = await do_scan(gen_chunks(last_block+1,tip),tip) + last_block = await do_scan(gen_chunks(last_block+1,tip,tip),tip) tip = await self.rpc.call('getblockcount') msg('Done') diff --git a/mmgen/proto/eth/daemon.py b/mmgen/proto/eth/daemon.py index cdc4e750..4f52881f 100755 --- a/mmgen/proto/eth/daemon.py +++ b/mmgen/proto/eth/daemon.py @@ -157,6 +157,7 @@ class erigon_daemon(geth_daemon): ) self.rpc_d = erigon_rpcdaemon( + cfg = self.cfg, proto = self.proto, rpc_port = self.rpc_port, private_port = self.private_port, @@ -185,12 +186,12 @@ class erigon_rpcdaemon(RPCDaemon): use_pidfile = False use_threads = True - def __init__(self,proto,rpc_port,private_port,test_suite,datadir): + def __init__(self,cfg,proto,rpc_port,private_port,test_suite,datadir): self.proto = proto self.test_suite = test_suite - super().__init__() + super().__init__(cfg) self.network = proto.network self.rpc_port = rpc_port diff --git a/mmgen/proto/eth/tx/unsigned.py b/mmgen/proto/eth/tx/unsigned.py index 72c02df7..1efd6a0d 100755 --- a/mmgen/proto/eth/tx/unsigned.py +++ b/mmgen/proto/eth/tx/unsigned.py @@ -62,7 +62,7 @@ class Unsigned(Completed,TxBase.Unsigned): if o['data']: if o['to']: - assert self.txobj['token_addr'] == TokenAddr(etx.creates.hex()),'Token address mismatch' + assert self.txobj['token_addr'] == TokenAddr(self.proto,etx.creates.hex()),'Token address mismatch' else: # token- or contract-creating transaction self.txobj['token_addr'] = TokenAddr(self.proto,etx.creates.hex()) diff --git a/mmgen/protocol.py b/mmgen/protocol.py index e4f7b5ef..59764389 100755 --- a/mmgen/protocol.py +++ b/mmgen/protocol.py @@ -211,7 +211,7 @@ class CoinProtocol(MMGenObject): die(4,'Private key == secp256k1_ge!') else: if not self.cfg.test_suite: - ymsg(f'Warning: private key is greater than secp256k1 group order!:\n {hexpriv}') + ymsg(f'Warning: private key is greater than secp256k1 group order!:\n {sec.hex()}') return (pk % self.secp256k1_ge).to_bytes(self.privkey_len,'big') class DummyWIF: diff --git a/mmgen/tx/sign.py b/mmgen/tx/sign.py index 0d78826c..07abd069 100755 --- a/mmgen/tx/sign.py +++ b/mmgen/tx/sign.py @@ -101,8 +101,8 @@ def add_keys(tx,src,infiles=None,saved_seeds=None,keyaddr_list=None): else: die(3,fmt(f""" {gc.proj_name} -> {tx.proto.coin} address mappings differ! - {{src_desc:<23}} {{mmid}} -> {{f.addr}} - {{'tx file:':<23}} {{e.mmid}} -> {{e.addr}} + {src_desc:<23} {mmid} -> {f.addr} + {'tx file:':<23} {e.mmid} -> {e.addr} """).strip()) if new_keys: cfg._util.vmsg(f'Added {len(new_keys)} wif key{suf(new_keys)} from {desc}') diff --git a/mmgen/wallet/seed.py b/mmgen/wallet/seed.py index 5a50d1eb..29e60bbe 100755 --- a/mmgen/wallet/seed.py +++ b/mmgen/wallet/seed.py @@ -56,7 +56,7 @@ class wallet(wallet): ret = baseconv('b58').tobytes(b,pad='seed') if ret is False: - msg(f'Invalid base-58 encoded seed: {val}') + msg(f'Invalid base-58 encoded seed: {b}') return False self.seed = Seed( self.cfg, ret )