minor cleanups
This commit is contained in:
parent
bfddd5b8ae
commit
040671bb06
7 changed files with 30 additions and 19 deletions
|
|
@ -168,7 +168,7 @@ class CmdTestRunner:
|
|||
|
||||
if self.logging:
|
||||
self.log_fd.write('[{}][{}:{}] {}\n'.format(
|
||||
(self.proto.coin.lower() if 'coin' in self.tg.passthru_opts else 'NONE'),
|
||||
self.proto.coin.lower(),
|
||||
self.tg.group_name,
|
||||
self.tg.test_name,
|
||||
cmd_disp))
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ class CmdTestXMRAutosign(CmdTestXMRWallet, CmdTestAutosignThreaded):
|
|||
('mine_initial_coins', 'mining initial coins'),
|
||||
('autosign_setup', 'autosign setup with Alice’s seed'),
|
||||
('autosign_xmr_setup', 'autosign setup (creation of Monero signing wallets)'),
|
||||
('create_watchonly_wallets', 'creating watch-only wallets from Alice’s wallet dumps'),
|
||||
('restore_watchonly_wallets', 'creating watch-only wallets from Alice’s wallet dumps'),
|
||||
('delete_tmp_dump_files', 'deleting Alice’s dump files'),
|
||||
('fund_alice1', 'sending funds to Alice (wallet #1)'),
|
||||
('check_bal_alice1', 'mining, checking balance (wallet #1)'),
|
||||
|
|
@ -261,7 +261,7 @@ class CmdTestXMRAutosign(CmdTestXMRWallet, CmdTestAutosignThreaded):
|
|||
self.remove_device()
|
||||
return t
|
||||
|
||||
def create_watchonly_wallets(self):
|
||||
def restore_watchonly_wallets(self):
|
||||
return self._create_wallets('restore')
|
||||
|
||||
def restore_wallets(self):
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@ class CmdTestXMRWallet(CmdTestBase):
|
|||
"""
|
||||
|
||||
networks = ('xmr',)
|
||||
passthru_opts = ()
|
||||
tmpdir_nums = [29]
|
||||
dfl_random_txs = 3
|
||||
color = True
|
||||
|
|
@ -377,13 +376,23 @@ class CmdTestXMRWallet(CmdTestBase):
|
|||
random_txs = self.dfl_random_txs)
|
||||
|
||||
def set_label_miner(self):
|
||||
return self.set_label_user('miner', '1:0:0,"Miner’s new primary account label [1:0:0]"', 'updated')
|
||||
return self.set_label_user(
|
||||
'miner',
|
||||
'1:0:0,"Miner’s new primary account label [1:0:0]"',
|
||||
'updated')
|
||||
|
||||
def remove_label_alice(self):
|
||||
return self.set_label_user('alice', '4:2:2,""', 'removed', add_opts=['--full-address'])
|
||||
return self.set_label_user(
|
||||
'alice',
|
||||
'4:2:2,""',
|
||||
'removed',
|
||||
add_opts = ['--full-address'])
|
||||
|
||||
def set_label_alice(self):
|
||||
return self.set_label_user('alice', '4:2:2,"Alice’s new subaddress label [4:2:2]"', 'set')
|
||||
return self.set_label_user(
|
||||
'alice',
|
||||
'4:2:2,"Alice’s new subaddress label [4:2:2]"',
|
||||
'set')
|
||||
|
||||
def set_label_user(self, user, label_spec, expect, add_opts=[]):
|
||||
data = self.users[user]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue