Addrlist(): addrfile -> infile
This commit is contained in:
parent
a50e9383a9
commit
0563916c96
4 changed files with 9 additions and 9 deletions
|
|
@ -159,7 +159,7 @@ class AddrList(MMGenObject): # Address info for a single seed ID
|
|||
self,
|
||||
cfg,
|
||||
proto,
|
||||
addrfile = '',
|
||||
infile = '',
|
||||
al_id = '',
|
||||
adata = [],
|
||||
seed = '',
|
||||
|
|
@ -187,9 +187,9 @@ class AddrList(MMGenObject): # Address info for a single seed ID
|
|||
src = 'gen'
|
||||
adata = self.generate(seed, addr_idxs if isinstance(addr_idxs, AddrIdxList) else AddrIdxList(addr_idxs))
|
||||
do_chksum = True
|
||||
elif addrfile: # data from MMGen address file
|
||||
self.infile = addrfile
|
||||
adata = self.file.parse_file(addrfile) # sets self.al_id
|
||||
elif infile: # data from MMGen address file
|
||||
self.infile = infile
|
||||
adata = self.file.parse_file(infile) # sets self.al_id
|
||||
do_chksum = True
|
||||
elif al_id and adata: # data from tracking wallet
|
||||
self.al_id = al_id
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ class OpCreateOffline(OpCreate):
|
|||
vkal = ViewKeyAddrList(
|
||||
cfg = self.cfg,
|
||||
proto = self.proto,
|
||||
addrfile = None,
|
||||
infile = None,
|
||||
addr_idxs = self.uargs.wallets,
|
||||
seed = self.seed_src.seed,
|
||||
skip_chksum_msg = True)
|
||||
|
|
|
|||
|
|
@ -102,9 +102,9 @@ class OpWallet(OpBase):
|
|||
for first_try in (True, False):
|
||||
try:
|
||||
self.kal = (ViewKeyAddrList if (self.cfg.watch_only and first_try) else KeyAddrList)(
|
||||
cfg = cfg,
|
||||
proto = self.proto,
|
||||
addrfile = str(self.autosign_viewkey_addr_file) if self.cfg.autosign else self.uargs.infile,
|
||||
cfg = cfg,
|
||||
proto = self.proto,
|
||||
infile = str(self.autosign_viewkey_addr_file) if self.cfg.autosign else self.uargs.infile,
|
||||
key_address_validity_check = True,
|
||||
skip_chksum_msg = True)
|
||||
break
|
||||
|
|
|
|||
|
|
@ -684,7 +684,7 @@ class CmdTestXMRWallet(CmdTestBase):
|
|||
kal = (ViewKeyAddrList if data.autosign else KeyAddrList)(
|
||||
cfg = cfg,
|
||||
proto = self.proto,
|
||||
addrfile = data.kafile,
|
||||
infile = data.kafile,
|
||||
skip_chksum_msg = True,
|
||||
key_address_validity_check = False)
|
||||
end_silence()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue