cmdtest autosign: asi_ts -> asi_online

This commit is contained in:
The MMGen Project 2024-02-17 09:45:08 +00:00
commit 2fae1a73f5
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
3 changed files with 23 additions and 23 deletions

View file

@ -123,7 +123,7 @@ class CmdTestAutosignBase(CmdTestBase):
def _create_autosign_instances(self,create_dirs):
d = {'offline': {'name':'asi'}}
if self.have_online:
d['online'] = {'name':'asi_ts'}
d['online'] = {'name':'asi_online'}
for subdir,data in d.items():
if create_dirs and not self.live:
for k in ('mountpoint','wallet_dir','dev_label_dir'):
@ -377,21 +377,21 @@ class CmdTestAutosignBase(CmdTestBase):
@property
def device_inserted_ts(self):
return self.asi_ts.dev_label_path.exists()
return self.asi_online.dev_label_path.exists()
def insert_device(self):
self.asi.dev_label_path.touch()
def insert_device_ts(self):
self.asi_ts.dev_label_path.touch()
self.asi_online.dev_label_path.touch()
def remove_device(self):
if self.asi.dev_label_path.exists():
self.asi.dev_label_path.unlink()
def remove_device_ts(self):
if self.asi_ts.dev_label_path.exists():
self.asi_ts.dev_label_path.unlink()
if self.asi_online.dev_label_path.exists():
self.asi_online.dev_label_path.unlink()
def _mount_ops(self, loc, cmd, *args, **kwargs):
return getattr(getattr(self,loc),cmd)(*args, silent=self.silent_mount, **kwargs)
@ -403,10 +403,10 @@ class CmdTestAutosignBase(CmdTestBase):
return self._mount_ops('asi', 'do_umount', *args, **kwargs)
def do_mount_online(self, *args, **kwargs):
return self._mount_ops('asi_ts', 'do_mount', *args, **kwargs)
return self._mount_ops('asi_online', 'do_mount', *args, **kwargs)
def do_umount_online(self, *args, **kwargs):
return self._mount_ops('asi_ts', 'do_umount', *args, **kwargs)
return self._mount_ops('asi_online', 'do_umount', *args, **kwargs)
class CmdTestAutosign(CmdTestAutosignBase):
'autosigning transactions for all supported coins'

View file

@ -228,8 +228,8 @@ class CmdTestXMRAutosign(CmdTestXMRWallet,CmdTestAutosignBase):
self.do_mount_online(no_xmr_chk=True)
self.asi_ts.xmr_dir.mkdir(exist_ok=True)
(self.asi_ts.xmr_dir / 'old.vkeys').touch()
self.asi_online.xmr_dir.mkdir(exist_ok=True)
(self.asi_online.xmr_dir / 'old.vkeys').touch()
self.do_umount_online()
@ -289,8 +289,8 @@ class CmdTestXMRAutosign(CmdTestXMRWallet,CmdTestAutosignBase):
def create_transfer_tx2(self):
self.do_mount_online()
get_file_with_ext(self.asi_ts.xmr_tx_dir,'rawtx',delete_all=True)
get_file_with_ext(self.asi_ts.xmr_tx_dir,'sigtx',delete_all=True)
get_file_with_ext(self.asi_online.xmr_tx_dir,'rawtx',delete_all=True)
get_file_with_ext(self.asi_online.xmr_tx_dir,'sigtx',delete_all=True)
self.do_umount_online()
return self._create_transfer_tx('0.257')
@ -429,10 +429,10 @@ class CmdTestXMRAutosign(CmdTestXMRWallet,CmdTestAutosignBase):
def create_fake_tx_files(self):
imsg('Creating fake transaction files')
self.asi_ts.msg_dir.mkdir(exist_ok=True)
self.asi_ts.xmr_dir.mkdir(exist_ok=True)
self.asi_ts.xmr_tx_dir.mkdir(exist_ok=True)
self.asi_ts.xmr_outputs_dir.mkdir(exist_ok=True)
self.asi_online.msg_dir.mkdir(exist_ok=True)
self.asi_online.xmr_dir.mkdir(exist_ok=True)
self.asi_online.xmr_tx_dir.mkdir(exist_ok=True)
self.asi_online.xmr_outputs_dir.mkdir(exist_ok=True)
for fn in (
'a.rawtx', 'a.sigtx',
@ -440,7 +440,7 @@ class CmdTestXMRAutosign(CmdTestXMRWallet,CmdTestAutosignBase):
'c.rawtx',
'd.sigtx',
):
(self.asi_ts.tx_dir / fn).touch()
(self.asi_online.tx_dir / fn).touch()
for fn in (
'a.rawmsg.json', 'a.sigmsg.json',
@ -448,7 +448,7 @@ class CmdTestXMRAutosign(CmdTestXMRWallet,CmdTestAutosignBase):
'c.sigmsg.json',
'd.rawmsg.json', 'd.sigmsg.json',
):
(self.asi_ts.msg_dir / fn).touch()
(self.asi_online.msg_dir / fn).touch()
for fn in (
'a.rawtx', 'a.sigtx', 'a.subtx',
@ -458,20 +458,20 @@ class CmdTestXMRAutosign(CmdTestXMRWallet,CmdTestAutosignBase):
'e.rawtx',
'f.sigtx','f.subtx',
):
(self.asi_ts.xmr_tx_dir / fn).touch()
(self.asi_online.xmr_tx_dir / fn).touch()
for fn in (
'a.raw', 'a.sig',
'b.raw',
'c.sig',
):
(self.asi_ts.xmr_outputs_dir / fn).touch()
(self.asi_online.xmr_outputs_dir / fn).touch()
return 'ok'
def _gen_listing(self):
for k in ('tx_dir','msg_dir','xmr_tx_dir','xmr_outputs_dir'):
d = getattr(self.asi_ts,k)
d = getattr(self.asi_online,k)
if d.is_dir():
yield '{:12} {}'.format(
str(Path(*d.parts[6:])) + ':',
@ -492,9 +492,9 @@ class CmdTestXMRAutosign(CmdTestXMRWallet,CmdTestAutosignBase):
after = '\n'.join(self._gen_listing())
for k in ('tx','msg','xmr'):
shutil.rmtree(self.asi_ts.mountpoint / k)
shutil.rmtree(self.asi_online.mountpoint / k)
self.asi_ts.tx_dir.mkdir()
self.asi_online.tx_dir.mkdir()
self.do_umount_online()

View file

@ -297,7 +297,7 @@ class CmdTestXMRWallet(CmdTestBase):
if autosign:
kafile_suf = 'vkeys'
fn_stem = 'MoneroWatchOnlyWallet'
kafile_dir = self.asi_ts.xmr_dir
kafile_dir = self.asi_online.xmr_dir
else:
kafile_suf = 'akeys'
fn_stem = 'MoneroWallet'