From a19db1858a0c5cd9ad79212c99deee8cda72190c Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Tue, 18 Apr 2023 18:35:55 +0000 Subject: [PATCH] new AutosignConfig class --- mmgen/autosign.py | 4 ++++ mmgen/main_autosign.py | 7 +++---- test/test_py_d/ts_autosign.py | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/mmgen/autosign.py b/mmgen/autosign.py index 26258338..984824e9 100755 --- a/mmgen/autosign.py +++ b/mmgen/autosign.py @@ -16,10 +16,14 @@ import sys,os,asyncio from subprocess import run,PIPE,DEVNULL from collections import namedtuple +from .cfg import Config from .util import msg,msg_r,ymsg,rmsg,gmsg,bmsg,die,suf,fmt,fmt_list from .color import yellow,red,orange from .wallet import Wallet +class AutosignConfig(Config): + _set_ok = ('usr_randchars','_proto','outdir','passwd_file') + class Autosign: dfl_mountpoint = os.path.join(os.sep,'mnt','mmgen_autosign') diff --git a/mmgen/main_autosign.py b/mmgen/main_autosign.py index fca6a88b..d9d221fd 100755 --- a/mmgen/main_autosign.py +++ b/mmgen/main_autosign.py @@ -116,7 +116,9 @@ This command is currently available only on Linux-based platforms. } } -cfg = Config( +from .autosign import Autosign,AutosignConfig + +cfg = AutosignConfig( opts_data = opts_data, init_opts = { 'quiet': True, @@ -129,9 +131,6 @@ cfg = Config( cmd_args = cfg._args -type(cfg)._set_ok += ('outdir','passwd_file') - -from .autosign import Autosign asi = Autosign(cfg) cfg._post_init() diff --git a/test/test_py_d/ts_autosign.py b/test/test_py_d/ts_autosign.py index c72061a6..fafcf712 100755 --- a/test/test_py_d/ts_autosign.py +++ b/test/test_py_d/ts_autosign.py @@ -32,7 +32,7 @@ from .ts_shared import * from .input import * from mmgen.led import LEDControl -from mmgen.autosign import Autosign +from mmgen.autosign import Autosign,AutosignConfig filedir_map = ( ('btc',''), @@ -91,9 +91,9 @@ class TestSuiteAutosignBase(TestSuiteBase): self.network_ids = [c+'_tn' for c in self.daemon_coins] + self.daemon_coins - as_cfg = Config() - type(as_cfg)._set_ok += ('outdir','passwd_file') - self.asi = Autosign(as_cfg) + self.asi = Autosign( + AutosignConfig() + ) if self.simulate and not cfg.exact_output: die(1,red('This command must be run with --exact-output enabled!'))