From 1f3195bfd2b7d5852bb69780b8b9bb8967eba522 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Thu, 9 Apr 2020 16:09:22 +0000 Subject: [PATCH] rename class: Wallet -> MMGenWallet --- mmgen/main_wallet.py | 4 ++-- mmgen/seed.py | 8 ++++---- mmgen/txsign.py | 2 +- mmgen/util.py | 4 ++-- test/test_py_d/ts_main.py | 20 ++++++++++---------- test/test_py_d/ts_ref_3seed.py | 2 +- test/test_py_d/ts_regtest.py | 6 +++--- test/test_py_d/ts_seedsplit.py | 8 ++++---- test/test_py_d/ts_shared.py | 6 +++--- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/mmgen/main_wallet.py b/mmgen/main_wallet.py index 457ac8ee..67357d3a 100755 --- a/mmgen/main_wallet.py +++ b/mmgen/main_wallet.py @@ -22,7 +22,7 @@ mmgen/main_wallet: Entry point for MMGen wallet-related scripts import os from mmgen.common import * -from mmgen.seed import SeedSource,Wallet +from mmgen.seed import SeedSource,MMGenWallet from mmgen.filename import find_file_in_dir from mmgen.obj import MMGenWalletLabel,MasterShareIdx @@ -233,7 +233,7 @@ else: assert invoked_as == 'gen','dw' assert not opt.outdir,'dw' assert not opt.stdout,'dw' - assert not find_file_in_dir(Wallet,g.data_dir),'dw' + assert not find_file_in_dir(MMGenWallet,g.data_dir),'dw' m = 'Make this wallet your default and move it to the data directory?' assert keypress_confirm(m,default_yes=True),'dw' except Exception as e: diff --git a/mmgen/seed.py b/mmgen/seed.py index 7568a985..b8a46b1c 100755 --- a/mmgen/seed.py +++ b/mmgen/seed.py @@ -535,11 +535,11 @@ class SeedSource(MMGenObject,metaclass=SeedSourceMeta): sstype.__name__, 'input file format' ) if seed or seed_bin: - me = super(cls,cls).__new__(out_cls or Wallet) # default to Wallet + me = super(cls,cls).__new__(out_cls or MMGenWallet) # default to MMGenWallet me.seed = seed or Seed(seed_bin=seed_bin) me.op = 'new' elif ss: - me = super(cls,cls).__new__((ss.__class__ if passchg else out_cls) or Wallet) + me = super(cls,cls).__new__((ss.__class__ if passchg else out_cls) or MMGenWallet) me.seed = ss.seed me.ss_in = ss me.op = ('conv','pwchg_new')[bool(passchg)] @@ -560,7 +560,7 @@ class SeedSource(MMGenObject,metaclass=SeedSourceMeta): me = super(cls,cls).__new__(cls.fmt_code_to_type(in_fmt)) me.op = ('old','pwchg_old')[bool(passchg)] else: # called with no arguments: initialize with random seed - me = super(cls,cls).__new__(out_cls or Wallet) + me = super(cls,cls).__new__(out_cls or MMGenWallet) me.seed = Seed(None) me.op = 'new' @@ -1136,7 +1136,7 @@ class MMGenHexSeedFile(SeedSourceUnenc): return True -class Wallet(SeedSourceEnc): +class MMGenWallet(SeedSourceEnc): fmt_codes = ('wallet','w') desc = g.proj_name + ' wallet' diff --git a/mmgen/txsign.py b/mmgen/txsign.py index 91e31584..3e73cd96 100755 --- a/mmgen/txsign.py +++ b/mmgen/txsign.py @@ -120,7 +120,7 @@ def get_seed_files(opt,args): u,e = SeedSourceUnenc,SeedSourceEnc ret = _pop_and_return(args,u.get_extensions()) from mmgen.filename import find_file_in_dir - wf = find_file_in_dir(Wallet,g.data_dir) # Make this the first encrypted ss in the list + wf = find_file_in_dir(MMGenWallet,g.data_dir) # Make this the first encrypted ss in the list if wf: ret.append(wf) ret += _pop_and_return(args,e.get_extensions()) if not (ret or opt.mmgen_keys_from_file or opt.keys_from_file): # or opt.use_wallet_dat diff --git a/mmgen/util.py b/mmgen/util.py index 6f4986d3..3f3fcd0b 100755 --- a/mmgen/util.py +++ b/mmgen/util.py @@ -478,9 +478,9 @@ def make_full_path(outdir,outfile): def get_seed_file(cmd_args,nargs,invoked_as=None): from mmgen.filename import find_file_in_dir - from mmgen.seed import Wallet + from mmgen.seed import MMGenWallet - wf = find_file_in_dir(Wallet,g.data_dir) + wf = find_file_in_dir(MMGenWallet,g.data_dir) wd_from_opt = bool(opt.hidden_incog_input_params or opt.in_fmt) # have wallet data from opt? diff --git a/test/test_py_d/ts_main.py b/test/test_py_d/ts_main.py index f00c9d84..999ac6cc 100755 --- a/test/test_py_d/ts_main.py +++ b/test/test_py_d/ts_main.py @@ -22,7 +22,7 @@ ts_main.py: Basic operations tests for the test.py test suite from mmgen.globalvars import g from mmgen.opts import opt -from mmgen.seed import SeedSource,Wallet,MMGenMnemonic,IncogWallet,MMGenSeedFile +from mmgen.seed import SeedSource,MMGenWallet,MMGenMnemonic,IncogWallet,MMGenSeedFile from ..include.common import * from .common import * from .ts_base import * @@ -184,7 +184,7 @@ class TestSuiteMain(TestSuiteBase,TestSuiteShared): return self.passchg(wf=None,pf=pf,dfl_wallet=True) def walletchk_newpass_dfl_wallet(self,pf): - return self.walletchk_newpass(wf=None,wcls=Wallet,pf=pf,dfl_wallet=True) + return self.walletchk_newpass(wf=None,wcls=MMGenWallet,pf=pf,dfl_wallet=True) def delete_dfl_wallet(self,pf): self.write_to_tmpfile('del_dw_run',b'',binary=True) @@ -204,7 +204,7 @@ class TestSuiteMain(TestSuiteBase,TestSuiteShared): t.license() t.usr_rand(self.usr_rand_chars) t.expect('Generating') - wcls = Wallet + wcls = MMGenWallet t.passphrase_new('new '+wcls.desc,self.wpasswd) t.label() if not self.have_dfl_wallet and gen_dfl_wallet: @@ -218,7 +218,7 @@ class TestSuiteMain(TestSuiteBase,TestSuiteShared): if wf != 'default': args += [wf] t = self.spawn('mmgen-subwalletgen', args + ['10s']) t.license() - wcls = Wallet + wcls = MMGenWallet t.passphrase(wcls.desc,self.cfgs['1']['wpasswd']) t.expect('Generating subseed 10S') t.passphrase_new('new '+wcls.desc,'foo') @@ -251,7 +251,7 @@ class TestSuiteMain(TestSuiteBase,TestSuiteShared): }[label_action] t = self.spawn('mmgen-passchg', add_args + [self.usr_rand_arg, '-p2'] + ([wf] if wf else [])) t.license() - wcls = Wallet + wcls = MMGenWallet t.passphrase(wcls.desc,self.cfgs['1']['wpasswd'],pwtype='old') t.expect_getend('Hash preset changed to ') t.passphrase(wcls.desc,self.wpasswd,pwtype='new') # reuse passphrase? @@ -469,7 +469,7 @@ class TestSuiteMain(TestSuiteBase,TestSuiteShared): t.expect('OK? (Y/n): ','\n') if seed_args: # sign and send t.do_comment(False,has_label=True) - for cnum,wcls in (('1',IncogWallet),('3',Wallet),('4',Wallet)): + for cnum,wcls in (('1',IncogWallet),('3',MMGenWallet),('4',MMGenWallet)): t.passphrase(wcls.desc,self.cfgs[cnum]['wpasswd']) self._do_confirm_send(t,quiet=not g.debug,confirm_send=True) if g.debug: @@ -521,7 +521,7 @@ class TestSuiteMain(TestSuiteBase,TestSuiteShared): if ocls == IncogWalletHidden: self.write_to_tmpfile(incog_id_fn,incog_id) t.hincog_create(hincog_bytes) - elif ocls == Wallet: + elif ocls == MMGenWallet: t.label() return t.written_to_file(capfirst(ocls.desc),oo=True),t @@ -665,7 +665,7 @@ class TestSuiteMain(TestSuiteBase,TestSuiteShared): args = ['-d',self.tmpdir,'-p1',self.usr_rand_arg,'-l'+seed_len,'-ib'] t = self.spawn('mmgen-walletconv', args + [bwf]) t.license() - wcls = Wallet + wcls = MMGenWallet t.passphrase_new('new ' +wcls.desc,self.wpasswd) t.usr_rand(self.usr_rand_chars) t.label() @@ -686,7 +686,7 @@ class TestSuiteMain(TestSuiteBase,TestSuiteShared): t.do_decrypt_ka_data(hp='1',pw=self.cfgs['14']['kapasswd']) t.view_tx('t') - for cnum,wcls in (('1',IncogWallet),('3',Wallet)): + for cnum,wcls in (('1',IncogWallet),('3',MMGenWallet)): t.passphrase('{}'.format(wcls.desc),self.cfgs[cnum]['wpasswd']) self.txsign_end(t,has_label=True) @@ -699,7 +699,7 @@ class TestSuiteMain(TestSuiteBase,TestSuiteShared): t = self.txcreate_common(sources=['1','2','3','4','14'], non_mmgen_input='4',do_label=True,txdo_args=[f7,f8,f9,f10],add_args=add_args) - for cnum,wcls in (('1',IncogWallet),('3',Wallet)): + for cnum,wcls in (('1',IncogWallet),('3',MMGenWallet)): t.passphrase('{}'.format(wcls.desc),self.cfgs[cnum]['wpasswd']) self.txsign_ui_common(t) diff --git a/test/test_py_d/ts_ref_3seed.py b/test/test_py_d/ts_ref_3seed.py index 9223e660..50a5ca2c 100755 --- a/test/test_py_d/ts_ref_3seed.py +++ b/test/test_py_d/ts_ref_3seed.py @@ -144,7 +144,7 @@ class TestSuiteRef3Seed(TestSuiteBase,TestSuiteShared): t = self.spawn('mmgen-walletconv', args + [self.usr_rand_arg]) t.license() t.expect('Enter brainwallet: ', ref_wallet_brainpass+'\n') - ocls = Wallet + ocls = MMGenWallet t.passphrase_new('new '+ocls.desc,self.wpasswd) t.usr_rand(self.usr_rand_chars) fn = os.path.split(t.written_to_file(capfirst(ocls.desc)))[-1] diff --git a/test/test_py_d/ts_regtest.py b/test/test_py_d/ts_regtest.py index 148c331b..aa5616e0 100755 --- a/test/test_py_d/ts_regtest.py +++ b/test/test_py_d/ts_regtest.py @@ -27,14 +27,14 @@ from mmgen.opts import opt from mmgen.util import die,gmsg,write_data_to_file from mmgen.protocol import CoinProtocol from mmgen.addr import AddrList -from mmgen.seed import Wallet +from mmgen.seed import MMGenWallet from ..include.common import * from .common import * pat_date = r'\b\d\d-\d\d-\d\d\b' pat_date_time = r'\b\d\d\d\d-\d\d-\d\d\s+\d\d:\d\d\b' -dfl_wcls = Wallet +dfl_wcls = MMGenWallet rt_pw = 'abc-α' rt_data = { 'tx_fee': {'btc':'0.0001','bch':'0.001','ltc':'0.01'}, @@ -307,7 +307,7 @@ class TestSuiteRegtest(TestSuiteBase,TestSuiteShared): if subseed_idx in self.usr_subsids[user]: return self.usr_subsids[user][subseed_idx] - icls = Wallet + icls = MMGenWallet fn = get_file_with_ext(self._user_dir(user),icls.ext) t = self.spawn('mmgen-tool',['get_subseed',subseed_idx,'wallet='+fn],no_msg=True) t.passphrase(icls.desc,rt_pw) diff --git a/test/test_py_d/ts_seedsplit.py b/test/test_py_d/ts_seedsplit.py index 46ef3b5b..97fe9268 100755 --- a/test/test_py_d/ts_seedsplit.py +++ b/test/test_py_d/ts_seedsplit.py @@ -22,7 +22,7 @@ ts_seedsplit.py: Seed split/join tests for the test.py test suite from mmgen.globalvars import g from mmgen.opts import opt -from mmgen.seed import SeedSource,Wallet,IncogWallet,IncogWalletHex,IncogWalletHidden,SeedSourceEnc +from mmgen.seed import SeedSource,MMGenWallet,IncogWallet,IncogWalletHex,IncogWalletHidden,SeedSourceEnc from .ts_base import * @@ -30,7 +30,7 @@ ref_wf = 'test/ref/98831F3A.bip39' ref_sid = '98831F3A' wpasswd = 'abc' sh1_passwd = 'xyz' -dfl_wcls = Wallet +dfl_wcls = MMGenWallet class TestSuiteSeedSplit(TestSuiteBase): 'splitting and joining seeds' @@ -135,7 +135,7 @@ class TestSuiteSeedSplit(TestSuiteBase): if bad_invocation: t.read() return t - icls = ( Wallet if 'mmdat' in in_exts + icls = ( MMGenWallet if 'mmdat' in in_exts else IncogWallet if 'mmincog' in in_exts else IncogWalletHex if 'mmincox' in in_exts else IncogWalletHidden if '-H' in add_args @@ -151,7 +151,7 @@ class TestSuiteSeedSplit(TestSuiteBase): sid_cmp = t.expect_getend('Joined Seed ID: ') cmp_or_die(sid,sid_cmp) ocls = SeedSource.fmt_code_to_type(ofmt) - if ocls == Wallet: + if ocls == MMGenWallet: t.hash_preset('new '+ocls.desc,'1') t.passphrase_new('new '+ocls.desc,wpasswd) t.written_to_file(capfirst(ocls.desc)) diff --git a/test/test_py_d/ts_shared.py b/test/test_py_d/ts_shared.py index d7f4174c..b3f20e82 100755 --- a/test/test_py_d/ts_shared.py +++ b/test/test_py_d/ts_shared.py @@ -24,7 +24,7 @@ import os from mmgen.globalvars import g from mmgen.opts import opt from mmgen.util import ymsg -from mmgen.seed import SeedSource,SeedSourceEnc,Brainwallet,Wallet,IncogWalletHidden +from mmgen.seed import SeedSource,SeedSourceEnc,Brainwallet,MMGenWallet,IncogWalletHidden from ..include.common import * from .common import * @@ -158,7 +158,7 @@ class TestSuiteShared(object): t = self.spawn('mmgen-txsign', opts, extra_desc) t.license() t.view_tx(view) - wcls = Wallet if dfl_wallet else SeedSource.ext_to_type(get_extension(wf)) + wcls = MMGenWallet if dfl_wallet else SeedSource.ext_to_type(get_extension(wf)) pw = issubclass(wcls,SeedSourceEnc) and wcls != Brainwallet if pw: t.passphrase(wcls.desc,self.wpasswd) @@ -215,7 +215,7 @@ class TestSuiteShared(object): [getattr(self,'{}_idx_list'.format(cmd_pfx))], extra_desc='({})'.format(mmtype) if mmtype in ('segwit','bech32') else '') t.license() - wcls = Wallet if dfl_wallet else SeedSource.ext_to_type(get_extension(wf)) + wcls = MMGenWallet if dfl_wallet else SeedSource.ext_to_type(get_extension(wf)) t.passphrase(wcls.desc,self.wpasswd) t.expect('Passphrase is OK') desc = ('address','password')[passgen]