mmgen/mmgen-wallet
1
Fork 0
Code Releases 28 Wiki Activity

autosign: use fakemod for test cfg initialization

Browse source
This commit is contained in:
The MMGen Project 2024-02-22 12:48:42 +00:00
commit ea4dd0a074
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
3 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
mmgen/autosign.py
View file

@ -273,9 +273,14 @@ class Autosign:
have_msg_dir = False
def __init__(self,cfg):
def init_cfg(self): # see test/overlay/fakemods/mmgen/autosign.py
self.mountpoint = Path(self.cfg.mountpoint or self.dfl_mountpoint)
self.wallet_dir = Path(self.cfg.wallet_dir or self.dfl_wallet_dir)
self.dev_label_path = Path(self.dfl_dev_label_dir) / self.dev_label
self.mount_cmd = 'mount'
self.umount_cmd = 'umount'
self.cfg = cfg
def __init__(self,cfg):
if cfg.mnemonic_fmt:
if cfg.mnemonic_fmt not in self.mn_fmts:
@ -283,21 +288,8 @@ class Autosign:
cfg.mnemonic_fmt,
fmt_list( self.mn_fmts, fmt='no_spc' ) ))
if pfx := cfg.test_suite_root_pfx:
subdir = 'online' if cfg.online else 'offline'
self.mountpoint = Path(f'{pfx}/{subdir}/{self.dfl_mountpoint}')
self.wallet_dir = Path(f'{pfx}/{subdir}/{self.dfl_wallet_dir}')
self.dev_label_path = Path(f'{pfx}/{subdir}/{self.dfl_dev_label_dir}') / self.dev_label
# mount --type=fuse-ext2 --options=rw+ ### current fuse-ext2 (0.4 29) is buggy - can’t use
self.fs_image_path = Path(f'{pfx}/removable_device_image')
self.mount_cmd = f'sudo mount {self.fs_image_path}'
self.umount_cmd = 'sudo umount'
else:
self.mountpoint = Path(cfg.mountpoint or self.dfl_mountpoint)
self.wallet_dir = Path(cfg.wallet_dir or self.dfl_wallet_dir)
self.dev_label_path = Path(self.dfl_dev_label_dir) / self.dev_label
self.mount_cmd = 'mount'
self.umount_cmd = 'umount'
self.cfg = cfg
self.init_cfg()
self.tx_dir = self.mountpoint / 'tx'
self.msg_dir = self.mountpoint / 'msg'

2
mmgen/data/version
View file

@ -1 +1 @@
14.1.dev11
14.1.dev12

19
test/overlay/fakemods/mmgen/autosign.py Normal file
View file

@ -0,0 +1,19 @@
from .autosign_orig import *
class overlay_fake_Autosign:
def init_cfg(self):
if pfx := self.cfg.test_suite_root_pfx:
subdir = 'online' if self.cfg.online else 'offline'
self.mountpoint = Path(f'{pfx}/{subdir}/{self.dfl_mountpoint}')
self.wallet_dir = Path(f'{pfx}/{subdir}/{self.dfl_wallet_dir}')
self.dev_label_path = Path(f'{pfx}/{subdir}/{self.dfl_dev_label_dir}') / self.dev_label
# mount --type=fuse-ext2 --options=rw+ ### current fuse-ext2 (0.4 29) is buggy - can’t use
self.fs_image_path = Path(f'{pfx}/removable_device_image')
self.mount_cmd = f'sudo mount {self.fs_image_path}'
self.umount_cmd = 'sudo umount'
else:
self.init_cfg_orig()
Autosign.init_cfg_orig = Autosign.init_cfg
Autosign.init_cfg = overlay_fake_Autosign.init_cfg