minor changes

This commit is contained in:
The MMGen Project 2019-10-16 17:10:13 +00:00
commit 83ad241963
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
3 changed files with 5 additions and 4 deletions

View file

@ -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:

View file

@ -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

View file

@ -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 ), ],