Browse Source

fixes and cleanups

The MMGen Project 3 years ago
parent
commit
abffe1fb57
2 changed files with 15 additions and 10 deletions
  1. 2 1
      mmgen/main_txsign.py
  2. 13 9
      test/test_py_d/ts_ref_3seed.py

+ 2 - 1
mmgen/main_txsign.py

@@ -23,6 +23,7 @@ mmgen-txsign: Sign a transaction generated by 'mmgen-txcreate'
 from .common import *
 from .subseed import SubSeedIdxRange
 from .wallet import Wallet
+from .color import orange
 
 # -w, --use-wallet-dat (keys from running coin daemon) removed: use walletdump rpc instead
 opts_data = {
@@ -121,7 +122,7 @@ async def main():
 
 		if len(tx_files) > 1:
 			tx_num_disp = f' #{tx_num}'
-			msg(f'\nTransaction{tx_num_disp} of {len(tx_files)}:')
+			msg(orange(f'\nTransaction{tx_num_disp} of {len(tx_files)}:'))
 
 		from .tx import UnsignedTX
 		tx1 = UnsignedTX(filename=tx_file)

+ 13 - 9
test/test_py_d/ts_ref_3seed.py

@@ -84,27 +84,31 @@ class TestSuiteRef3Seed(TestSuiteBase,TestSuiteShared):
 		wf = joinpath(ref_dir,TestSuiteWalletConv.sources[str(self.seed_len)]['ref_wallet'])
 		return self.walletchk(wf,pf=None,sid=self.seed_id)
 
-	def ref_ss_chk(self,ss=None):
-		wf = joinpath(ref_dir,f'{self.seed_id}.{ss.ext}')
-		return self.walletchk(wf,pf=None,wcls=ss,sid=self.seed_id)
+	def ref_ss_chk(self,ss_type):
+		ss = get_wallet_cls(ss_type)
+		return self.walletchk(
+			wf   = joinpath(ref_dir,f'{self.seed_id}.{ss.ext}'),
+			pf   = None,
+			wcls = ss,
+			sid  = self.seed_id )
 
 	def ref_seed_chk(self):
-		return self.ref_ss_chk(ss=get_wallet_cls('seed'))
+		return self.ref_ss_chk('seed')
 
 	def ref_hex_chk(self):
-		return self.ref_ss_chk(ss=get_wallet_cls('mmhex'))
+		return self.ref_ss_chk('mmhex')
 
 	def ref_plainhex_chk(self):
-		return self.ref_ss_chk(ss=get_wallet_cls('plainhex'))
+		return self.ref_ss_chk('plainhex')
 
 	def ref_dieroll_chk(self):
-		return self.ref_ss_chk(ss=get_wallet_cls('dieroll'))
+		return self.ref_ss_chk('dieroll')
 
 	def ref_mn_chk(self):
-		return self.ref_ss_chk(ss=get_wallet_cls('words'))
+		return self.ref_ss_chk('words')
 
 	def ref_bip39_chk(self):
-		return self.ref_ss_chk(ss=get_wallet_cls('bip39'))
+		return self.ref_ss_chk('bip39')
 
 	def ref_hincog_chk(self,desc='hidden incognito data'):
 		source = TestSuiteWalletConv.sources[str(self.seed_len)]