From a5ba64a95691473365d90558e6f12cb37d1f75b6 Mon Sep 17 00:00:00 2001 From: MMGen Date: Mon, 14 Oct 2019 20:23:14 +0000 Subject: [PATCH] minor changes, whitespace --- mmgen/addr.py | 9 ++++++--- test/test_py_d/ts_misc.py | 1 + test/unit_tests_d/ut_seedsplit.py | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mmgen/addr.py b/mmgen/addr.py index 61d6aba1..cbf27fd5 100755 --- a/mmgen/addr.py +++ b/mmgen/addr.py @@ -480,7 +480,8 @@ Removed {{}} duplicate WIF key{{}} from keylist (also in {pnm} key-address file self.al_id.hl(),t_addrs,self.gen_desc,suf(t_addrs,self.gen_desc_pl),' '*15)) return out - def check_format(self,addr): return True # format is checked when added to list entry object + def check_format(self,addr): + return True # format is checked when added to list entry object def scramble_seed(self,seed): is_btcfork = g.proto.base_coin == 'BTC' @@ -613,7 +614,8 @@ Removed {{}} duplicate WIF key{{}} from keylist (also in {pnm} key-address file else: # First line with idx out.append(fs.format(e.idx,e.addr,c)) if self.has_keys: - if opt.b16: out.append(fs.format('', 'orig_hex: '+e.sec.orig_hex,c)) + if opt.b16: + out.append(fs.format('', 'orig_hex: '+e.sec.orig_hex,c)) out.append(fs.format('','{} {}'.format(self.al_id.mmtype.wif_label,e.sec.wif),c)) for k in ('viewkey','wallet_passwd'): v = getattr(e,k) @@ -818,7 +820,8 @@ Record this checksum: it will be used to verify the password file in the future self.pw_id_str = MMGenPWIDString(pw_id_str) self.set_pw_fmt(pw_fmt) self.set_pw_len(pw_len) - if chk_params_only: return + if chk_params_only: + return self.al_id = AddrListID(seed.sid,MMGenPasswordType('P')) self.data = self.generate(seed,pw_idxs) diff --git a/test/test_py_d/ts_misc.py b/test/test_py_d/ts_misc.py index 88511f01..eb141d1a 100755 --- a/test/test_py_d/ts_misc.py +++ b/test/test_py_d/ts_misc.py @@ -41,6 +41,7 @@ class TestSuiteHelp(TestSuiteBase): arg = '--help', scripts = ( 'walletgen','walletconv','walletchk','passchg','subwalletgen', 'addrgen','keygen','passgen', + 'seedsplit','seedjoin', 'txcreate','txsign','txsend','txdo','txbump', 'addrimport','tool','regtest','autosign')): for s in scripts: diff --git a/test/unit_tests_d/ut_seedsplit.py b/test/unit_tests_d/ut_seedsplit.py index 5e20f154..eda56c17 100755 --- a/test/unit_tests_d/ut_seedsplit.py +++ b/test/unit_tests_d/ut_seedsplit.py @@ -11,6 +11,8 @@ class unit_test(object): from mmgen.seed import Seed,SeedShareList from mmgen.obj import SeedShareIdx + g.debug_subseed = opt.verbose + def basic_ops(master_idx): test_data = { 'default': ( @@ -137,7 +139,7 @@ class unit_test(object): collisions += shares.data['long'][sid][1] assert collisions == collisions_chk, collisions - vmsg_r('\n{} collisions, last_sid {}'.format(collisions,last_sid)) + vmsg_r('{} collisions, last_sid {}'.format(collisions,last_sid)) msg('OK') def last_share_collisions():