Browse Source

A few minor fixes

MMGen 7 years ago
parent
commit
96b337e493
3 changed files with 6 additions and 3 deletions
  1. 1 1
      mmgen/globalvars.py
  2. 4 2
      mmgen/main.py
  3. 1 0
      test/tooltest.py

+ 1 - 1
mmgen/globalvars.py

@@ -142,7 +142,7 @@ class g(object):
 		'MMGEN_MIN_URANDCHARS',
 		'MMGEN_MIN_URANDCHARS',
 		'MMGEN_NO_LICENSE',
 		'MMGEN_NO_LICENSE',
 		'MMGEN_RPC_HOST',
 		'MMGEN_RPC_HOST',
-		'MMGEN_TESTNET'
+		'MMGEN_TESTNET',
 		'MMGEN_REGTEST'
 		'MMGEN_REGTEST'
 	)
 	)
 
 

+ 4 - 2
mmgen/main.py

@@ -55,7 +55,9 @@ def launch(what):
 			if os.getenv('MMGEN_TRACEBACK'):
 			if os.getenv('MMGEN_TRACEBACK'):
 				raise
 				raise
 			else:
 			else:
-				try:    m = u'{}\n'.format(e[0])
-				except: m = u'{!r}\n'.format(e[0])
+				try: m = u'{}\n'.format(e[0])
+				except:
+					try: m = u'{!r}\n'.format(e[0])
+					except: m = u'{!r}\n'.format(e)
 				sys.stderr.write(u'ERROR: ' + m)
 				sys.stderr.write(u'ERROR: ' + m)
 				sys.exit(2)
 				sys.exit(2)

+ 1 - 0
test/tooltest.py

@@ -146,6 +146,7 @@ cfg = {
 	'addrfile': '98831F3A{}[1,31-33,500-501,1010-1011]{}.addrs',
 	'addrfile': '98831F3A{}[1,31-33,500-501,1010-1011]{}.addrs',
 	'addrfile_chk':  {
 	'addrfile_chk':  {
 		'btc': ('6FEF 6FB9 7B13 5D91','3C2C 8558 BB54 079E'),
 		'btc': ('6FEF 6FB9 7B13 5D91','3C2C 8558 BB54 079E'),
+		'bch': ('6FEF 6FB9 7B13 5D91','3C2C 8558 BB54 079E'),
 		'ltc': ('AD52 C3FE 8924 AAF0','5738 5C4F 167C F9AE'),
 		'ltc': ('AD52 C3FE 8924 AAF0','5738 5C4F 167C F9AE'),
 	}
 	}
 }
 }