a few minor fixes and cleanups

This commit is contained in:
The MMGen Project 2023-09-30 15:36:40 +00:00
commit 603f47ff5e
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
3 changed files with 10 additions and 10 deletions

View file

@ -28,7 +28,7 @@ pk_bytes = namedtuple('coin_privkey_bytes',['idx','pos','data'])
def derive_coin_privkey_bytes(seed,idxs):
assert isinstance(idxs,AddrIdxList)
assert isinstance(idxs,AddrIdxList), f'{type(idxs)}: idx list not of type AddrIdxList'
t_keys = len(idxs)
pos = 0

View file

@ -37,7 +37,7 @@ def pmsg_r(*args,color=None):
sys.stderr.write(pfmt(*args,color=color))
def pdie(*args,exit_val=1):
pmsg(*args,color='red')
pmsg(*args,color='red' if exit_val else None)
sys.exit(exit_val)
def pexit(*args):
@ -112,12 +112,12 @@ class MMGenObjectMethods: # mixin class for MMGenObject
def pmsg(self,color=None):
sys.stdout.write('\n'+self.pfmt(color=color))
def pdie(self,exit_val=1,color=None):
self.pmsg(color=color)
def pdie(self,exit_val=1):
self.pmsg(color='red' if exit_val else None)
sys.exit(exit_val)
def pexit(self,color=None):
self.pdie(exit_val=0,color=color)
def pexit(self):
self.pdie(exit_val=0)
def pfmt(self,lvl=0,id_list=[],color=None):
from decimal import Decimal

View file

@ -13,11 +13,11 @@ class unit_tests_base:
def _silence(self):
if not cfg.verbose:
self.stdout = sys.stdout
self.stderr = sys.stderr
self.stdout_save = sys.stdout
self.stderr_save = sys.stderr
sys.stdout = sys.stderr = gv.stdout = gv.stderr = open(os.devnull,'w')
def _end_silence(self):
if not cfg.verbose:
sys.stdout = gv.stdout = self.stdout
sys.stderr = gv.stderr = self.stderr
sys.stdout = gv.stdout = self.stdout_save
sys.stderr = gv.stderr = self.stderr_save