From 603f47ff5e2aa1b16e5262e0e35c73fcf14d9f43 Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Sat, 30 Sep 2023 15:36:40 +0000
Subject: [PATCH] a few minor fixes and cleanups

---
 mmgen/derive.py               |  2 +-
 mmgen/devtools.py             | 10 +++++-----
 test/unit_tests_d/__init__.py |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mmgen/derive.py b/mmgen/derive.py
index f3b5d0aa..2ce057b6 100755
--- a/mmgen/derive.py
+++ b/mmgen/derive.py
@@ -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
diff --git a/mmgen/devtools.py b/mmgen/devtools.py
index a3001b3c..ad95c208 100755
--- a/mmgen/devtools.py
+++ b/mmgen/devtools.py
@@ -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
diff --git a/test/unit_tests_d/__init__.py b/test/unit_tests_d/__init__.py
index 611be6af..f37c7e33 100755
--- a/test/unit_tests_d/__init__.py
+++ b/test/unit_tests_d/__init__.py
@@ -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