diff --git a/mmgen/seed.py b/mmgen/seed.py index 141bb9aa..59e9461b 100755 --- a/mmgen/seed.py +++ b/mmgen/seed.py @@ -964,7 +964,7 @@ class BIP39Mnemonic(MMGenMnemonic): self.conv_cls = bip39 super().__init__(*args,**kwargs) -class SeedFile (SeedSourceUnenc): +class MMGenSeedFile(SeedSourceUnenc): stdin_ok = True fmt_codes = 'mmseed','seed','s' @@ -1014,11 +1014,11 @@ class SeedFile (SeedSourceUnenc): return True -class HexSeedFile(SeedSourceUnenc): +class MMGenHexSeedFile(SeedSourceUnenc): stdin_ok = True - fmt_codes = 'seedhex','hexseed','hex','mmhex' - desc = 'hexadecimal seed data' + fmt_codes = 'seedhex','hexseed','mmhex' + desc = 'hexadecimal seed data with checksum' ext = 'mmhex' def _format(self): diff --git a/test/test_py_d/ts_main.py b/test/test_py_d/ts_main.py index 2c04774c..95d972d4 100755 --- a/test/test_py_d/ts_main.py +++ b/test/test_py_d/ts_main.py @@ -515,7 +515,7 @@ class TestSuiteMain(TestSuiteBase,TestSuiteShared): end_silence() return t - def export_hex(self,wf,desc='hexadecimal seed data',out_fmt='hex',pf=None): + def export_hex(self,wf,desc='hexadecimal seed data with checksum',out_fmt='mmhex',pf=None): return self.export_seed(wf,desc=desc,out_fmt=out_fmt,pf=pf) def export_mnemonic(self,wf): @@ -555,7 +555,7 @@ class TestSuiteMain(TestSuiteBase,TestSuiteShared): t.req_exit_val = 1 return t - def addrgen_hex(self,wf,foo,desc='hexadecimal seed data',in_fmt='hex'): + def addrgen_hex(self,wf,foo,desc='hexadecimal seed data with checksum',in_fmt='mmhex'): return self.addrgen_seed(wf,foo,desc=desc,in_fmt=in_fmt) def addrgen_mnemonic(self,wf,foo): diff --git a/test/test_py_d/ts_ref_3seed.py b/test/test_py_d/ts_ref_3seed.py index 4c244ec1..8b69e8b6 100755 --- a/test/test_py_d/ts_ref_3seed.py +++ b/test/test_py_d/ts_ref_3seed.py @@ -79,12 +79,12 @@ class TestSuiteRef3Seed(TestSuiteBase,TestSuiteShared): return self.walletchk(wf,pf=None,desc=ss.desc,sid=self.seed_id) def ref_seed_chk(self): - from mmgen.seed import SeedFile - return self.ref_ss_chk(ss=SeedFile) + from mmgen.seed import MMGenSeedFile + return self.ref_ss_chk(ss=MMGenSeedFile) def ref_hex_chk(self): - from mmgen.seed import HexSeedFile - return self.ref_ss_chk(ss=HexSeedFile) + from mmgen.seed import MMGenHexSeedFile + return self.ref_ss_chk(ss=MMGenHexSeedFile) def ref_mn_chk(self): from mmgen.seed import MMGenMnemonic @@ -162,7 +162,7 @@ class TestSuiteRef3Seed(TestSuiteBase,TestSuiteShared): return self.ref_walletconv(fn,pf,ofmt='mmseed',desc='Seed data',ext='mmseed') def ref_walletconv_hexseed(self,fn,pf): - return self.ref_walletconv(fn,pf,ofmt='mmhex',desc='Hexadecimal seed data',ext='mmhex') + return self.ref_walletconv(fn,pf,ofmt='mmhex',desc='Hexadecimal seed data with checksum',ext='mmhex') def ref_walletconv_incog(self,fn,pf,desc='Incognito data',ofmt='incog',ext='mmincog'): args = ['-r0','-p1'] diff --git a/test/test_py_d/ts_seedsplit.py b/test/test_py_d/ts_seedsplit.py index 6fe75fd9..a78f7d7f 100755 --- a/test/test_py_d/ts_seedsplit.py +++ b/test/test_py_d/ts_seedsplit.py @@ -119,7 +119,7 @@ class TestSuiteSeedSplit(TestSuiteBase): t.hincog_create(1234) t.written_to_file(capfirst(desc)) else: - t.written_to_file('data') + t.written_to_file('with checksum' if ofmt == 'mmhex' else 'data') return t def ss_join(self,tdir,ofmt,in_exts,add_args=[],sid=None,bad_invocation=False,master=None,id_str=None): @@ -156,7 +156,7 @@ class TestSuiteSeedSplit(TestSuiteBase): t.passphrase_new('new MMGen wallet',wpasswd) t.written_to_file('MMGen wallet') else: - t.written_to_file('data') + t.written_to_file('with checksum' if ofmt == 'mmhex' else 'data') return t def get_hincog_arg(self,tdir,suf='-default-2of2'): @@ -171,29 +171,29 @@ class TestSuiteSeedSplit(TestSuiteBase): def ss_2way_B_dfl2(self): return self.ss_splt('2way_dfl2','hincog','default:2:2',['-J',self.get_hincog_arg('2way_dfl2')]) def ss_2way_join_dfl2(self): - return self.ss_join('2way_dfl2','hex',['mmseed'],['-H',self.get_hincog_arg('2way_dfl2')]) + return self.ss_join('2way_dfl2','mmhex',['mmseed'],['-H',self.get_hincog_arg('2way_dfl2')]) def ss_2way_A_alice(self): return self.ss_splt('2way_alice','w','alice:1:2') - def ss_2way_B_alice(self): return self.ss_splt('2way_alice','hex','alice:2:2') + def ss_2way_B_alice(self): return self.ss_splt('2way_alice','mmhex','alice:2:2') def ss_2way_join_alice(self): return self.ss_join('2way_alice','seed',['mmdat','mmhex']) def ss_2way_join_alice_mix(self): return self.ss_join('2way_alice','seed',['mmhex','mmdat']) def ss_2way_A_dfl_usw(self): return self.ss_splt('2way_dfl_usw','words','1:2',[],wf=ref_wf) def ss_2way_B_dfl_usw(self): return self.ss_splt('2way_dfl_usw','incog','2:2',[],wf=ref_wf) - def ss_2way_join_dfl_usw(self): return self.ss_join('2way_dfl_usw','hex',['mmwords','mmincog'],sid=ref_sid) + def ss_2way_join_dfl_usw(self): return self.ss_join('2way_dfl_usw','mmhex',['mmwords','mmincog'],sid=ref_sid) def ss_3way_A_dfl(self): return self.ss_splt('3way_dfl','words','1:3') def ss_3way_B_dfl(self): return self.ss_splt('3way_dfl','incog_hex','2:3') def ss_3way_C_dfl(self): return self.ss_splt('3way_dfl','bip39','3:3') - def ss_3way_join_dfl(self): return self.ss_join('3way_dfl','hex',['mmwords','mmincox','bip39']) - def ss_3way_join_dfl_mix(self): return self.ss_join('3way_dfl','hex',['bip39','mmwords','mmincox']) + def ss_3way_join_dfl(self): return self.ss_join('3way_dfl','mmhex',['mmwords','mmincox','bip39']) + def ss_3way_join_dfl_mix(self): return self.ss_join('3way_dfl','mmhex',['bip39','mmwords','mmincox']) def ss_2way_A_dfl_master3(self): return self.ss_splt('2way_dfl_master3','w','',master=3) def ss_2way_B_dfl_master3(self): return self.ss_splt('2way_dfl_master3','bip39','2:2',master=3) def ss_2way_join_dfl_master3(self): - return self.ss_join('2way_dfl_master3','hex',['mmdat','bip39'],master=3) + return self.ss_join('2way_dfl_master3','mmhex',['mmdat','bip39'],master=3) tdir2 = '3way_foobar_master7' def ss_3way_C_foobar_master7(self): @@ -202,7 +202,7 @@ class TestSuiteSeedSplit(TestSuiteBase): def ss_3way_B_foobar_master7(self): return self.ss_splt(self.tdir2,'bip39','φυβαρ:2:3',master=7) def ss_3way_A_foobar_master7(self): - return self.ss_splt(self.tdir2,'hex','φυβαρ:3:3',master=7) + return self.ss_splt(self.tdir2,'mmhex','φυβαρ:3:3',master=7) def ss_3way_join_foobar_master7(self): return self.ss_join(self.tdir2,'seed', ['bip39','mmhex'], ['-H',self.get_hincog_arg(self.tdir2,'-master7')],master=7,id_str='φυβαρ') @@ -217,7 +217,7 @@ class TestSuiteSeedSplit(TestSuiteBase): return t def ss_3way_join_dfl_bad_invocation(self): - t = self.ss_join('3way_dfl','hex', + t = self.ss_join('3way_dfl','mmhex', ['mmwords','mmincox','bip39'], id_str='foo', bad_invocation=True) diff --git a/test/test_py_d/ts_wallet.py b/test/test_py_d/ts_wallet.py index 335d4ee0..2e538366 100755 --- a/test/test_py_d/ts_wallet.py +++ b/test/test_py_d/ts_wallet.py @@ -62,7 +62,7 @@ class TestSuiteWalletConv(TestSuiteBase,TestSuiteShared): ('ref_mn_conv', 'conversion of saved MMGen native mnemonic'), ('ref_bip39_conv', 'conversion of saved BIP39 mnemonic'), ('ref_seed_conv', 'conversion of saved seed file'), - ('ref_hex_conv', 'conversion of saved hexadecimal seed file'), + ('ref_hex_conv', 'conversion of saved MMGen hexadecimal seed file'), ('ref_brain_conv', 'conversion of ref brainwallet'), ('ref_incog_conv', 'conversion of saved incog wallet'), ('ref_incox_conv', 'conversion of saved hex incog wallet'), @@ -72,7 +72,7 @@ class TestSuiteWalletConv(TestSuiteBase,TestSuiteShared): ('ref_wallet_conv_out', 'ref seed conversion to wallet'), ('ref_mn_conv_out', 'ref seed conversion to MMGen native mnemonic'), ('ref_bip39_conv_out', 'ref seed conversion to BIP39 mnemonic'), - ('ref_hex_conv_out', 'ref seed conversion to hex seed'), + ('ref_hex_conv_out', 'ref seed conversion to MMGen hex seed'), ('ref_seed_conv_out', 'ref seed conversion to seed'), ('ref_incog_conv_out', 'ref seed conversion to incog data'), ('ref_incox_conv_out', 'ref seed conversion to hex incog data'), @@ -101,7 +101,7 @@ class TestSuiteWalletConv(TestSuiteBase,TestSuiteShared): return self.ref_mn_conv(ext='mmseed',desc='Seed data') def ref_hex_conv(self): - return self.ref_mn_conv(ext='mmhex',desc='Hexadecimal seed data') + return self.ref_mn_conv(ext='mmhex',desc='Hexadecimal seed data with checksum') def ref_brain_conv(self): uopts = ['-i','b','-p','1','-l',str(self.seed_len)] @@ -137,7 +137,7 @@ class TestSuiteWalletConv(TestSuiteBase,TestSuiteShared): return self.walletconv_out('seed data','seed') def ref_hex_conv_out(self): - return self.walletconv_out('hexadecimal seed data','hexseed') + return self.walletconv_out('hexadecimal seed data with checksum','hexseed') def ref_incog_conv_out(self): return self.walletconv_out('incognito data',out_fmt='i',pw=True)