remove test_suite_xmr_autosign cfg var
This commit is contained in:
parent
5a7bb6850f
commit
f08a924665
5 changed files with 2 additions and 9 deletions
|
|
@ -423,7 +423,6 @@ class Autosign:
|
|||
'coin': 'xmr',
|
||||
'wallet_rpc_user': 'autosign',
|
||||
'wallet_rpc_password': 'autosign password', # nosec # B105 (offline device use only)
|
||||
'wallet_rpc_port': 23232 if self.cfg.test_suite_xmr_autosign else None,
|
||||
'wallet_dir': str(self.wallet_dir),
|
||||
'autosign': True,
|
||||
'autosign_mountpoint': str(self.mountpoint),
|
||||
|
|
|
|||
|
|
@ -119,9 +119,7 @@ class MoneroWalletDaemon(RPCDaemon):
|
|||
|
||||
self.network = proto.network
|
||||
self.wallet_dir = wallet_dir or (self.test_suite_datadir if self.test_suite else None)
|
||||
self.rpc_port = (
|
||||
self.cfg.wallet_rpc_port or
|
||||
getattr(self.rpc_ports, self.network) + (11 if self.test_suite else 0))
|
||||
self.rpc_port = getattr(self.rpc_ports, self.network) + (11 if self.test_suite else 0)
|
||||
|
||||
if port_shift:
|
||||
self.rpc_port += port_shift
|
||||
|
|
|
|||
|
|
@ -122,7 +122,6 @@ class CmdTestAutosignBase(CmdTestBase):
|
|||
asi = Autosign(
|
||||
Config({
|
||||
'coins': ','.join(self.coins),
|
||||
'test_suite_xmr_autosign': self.name == 'CmdTestXMRAutosign',
|
||||
'test_suite_autosign_threaded': self.threaded,
|
||||
'test_suite_root_pfx': None if self.live else self.tmpdir,
|
||||
'online': subdir == 'online'}))
|
||||
|
|
|
|||
|
|
@ -128,7 +128,6 @@ class CmdTestXMRAutosign(CmdTestXMRWallet, CmdTestAutosignThreaded):
|
|||
|
||||
self.xmrwallets_opt = f'--xmrwallets={self.users["alice"].kal_range}'
|
||||
self.autosign_opts = ['--autosign'] # mmgen-xmrwallet opts
|
||||
self.spawn_env['MMGEN_TEST_SUITE_XMR_AUTOSIGN'] = '1'
|
||||
|
||||
def create_tmp_wallets(self):
|
||||
self.spawn(msg_only=True)
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ for k, v in {
|
|||
'test_suite_popen_spawn': False, # line_input() - using getattr() with dfl val - OK
|
||||
'test_suite_hold_protect_disable': False, # init_term() - using getattr() with dfl val - OK
|
||||
'test_suite_autosign_threaded': False, # autosign - OK
|
||||
'test_suite_xmr_autosign': False, # autosign - OK
|
||||
'test_suite_root_pfx': '', # autosign - OK
|
||||
'test_suite_bogus_send': False, # tx.online - OK
|
||||
'test_datadir': os.path.join('test', 'tmp', 'data_dir'), # cfg - OK
|
||||
|
|
@ -74,8 +73,7 @@ Config._env_opts += (
|
|||
'MMGEN_TEST_SUITE_PEXPECT',
|
||||
'MMGEN_TEST_SUITE_PEXPECT_TIMEOUT',
|
||||
'MMGEN_TEST_SUITE_POPEN_SPAWN',
|
||||
'MMGEN_TEST_SUITE_ROOT_PFX',
|
||||
'MMGEN_TEST_SUITE_XMR_AUTOSIGN')
|
||||
'MMGEN_TEST_SUITE_ROOT_PFX')
|
||||
|
||||
if os.getenv('MMGEN_TEST_SUITE_POPEN_SPAWN'):
|
||||
Config.stdin_tty = True
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue