From 83ad2419634d493df04228bc95a25336339110d9 Mon Sep 17 00:00:00 2001 From: MMGen Date: Wed, 16 Oct 2019 17:10:13 +0000 Subject: [PATCH] minor changes --- mmgen/addr.py | 4 ++-- test/scrambletest.py | 1 + test/tooltest2.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mmgen/addr.py b/mmgen/addr.py index e1de95ab..af9a1efe 100755 --- a/mmgen/addr.py +++ b/mmgen/addr.py @@ -897,8 +897,8 @@ Record this checksum: it will be used to verify the password file in the future if pw_bytes > seed.byte_len: m1 = 'Cannot generate passwords with more entropy than underlying seed! ({} bits)' - m2 = 'Re-run the command with --passwd-len={}' if pf == 'hex' else \ - 'Re-run the command, specifying a password length of {} or less' + m2 = ( 'Re-run the command with --passwd-len={}' if pf in ('bip39','hex') else + 'Re-run the command, specifying a password length of {} or less' ) die(1,(m1+'\n'+m2).format(len(seed.data) * 8,good_pw_len)) if pf == 'hex' and pw_bytes < seed.byte_len: diff --git a/test/scrambletest.py b/test/scrambletest.py index 0725430c..f0c7d9fc 100755 --- a/test/scrambletest.py +++ b/test/scrambletest.py @@ -56,6 +56,7 @@ os.environ['MMGEN_DEBUG_ADDRLIST'] = '1' if not opt.system: os.environ['PYTHONPATH'] = repo_root +# TODO: add vectors for 'mmgen-passgen' from collections import OrderedDict test_data = OrderedDict([ # SCRAMBLED_SEED[:8] SCRAMBLE_KEY ID_STR LBL FIRST ADDR diff --git a/test/tooltest2.py b/test/tooltest2.py index 2cbf9fd8..da93a65f 100755 --- a/test/tooltest2.py +++ b/test/tooltest2.py @@ -605,8 +605,8 @@ tests = { }, 'passwdfile_chksum': { 'btc_mainnet': [ - ( ['test/ref/98831F3A-фубар@crypto.org-b58-20[1,4,9-11,1100].pws'], - 'A983 DAB9 5514 27FB', kafile_opts, kafile_code ), ], + ( ['test/ref/98831F3A-фубар@crypto.org-b58-20[1,4,1100].pws'], + 'DDD9 44B0 CA28 183F', kafile_opts, kafile_code ), ], }, 'txview': { 'btc_mainnet': [ ( ['test/ref/0B8D5A[15.31789,14,tl=1320969600].rawtx'], None ), ],