globalvars.py -> cfg.py

mmgen/addrdata.py

@@ -20,7 +20,7 @@
 addrdata: MMGen AddrData and related classes
 """
 
-from .globalvars import gc
+from .cfg import gc
 from .util import fmt,die
 from .base_obj import AsyncInit
 from .obj import MMGenObject,MMGenDict,get_obj

mmgen/addrfile.py

@@ -20,7 +20,7 @@
 addrfile: Address and password file classes for the MMGen suite
 """
 
-from .globalvars import gc
+from .cfg import gc
 from .util import msg,die,capfirst
 from .protocol import init_proto
 from .obj import MMGenObject,TwComment,WalletPassword,MMGenPWIDString

mmgen/altcoin.py

@@ -37,7 +37,7 @@ altcoin.py - Coin constants for Bitcoin-derived altcoins
 
 import sys
 
-from .globalvars import gc
+from .cfg import gc,Config
 from .util import msg
 
 def test_equal(desc,a,b,*cdata):

mmgen/globalvars.py → mmgen/cfg.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-globalvars: Constants and configuration options for the MMGen suite
+cfg: Configuration classes for the MMGen suite
 """
 
 import sys,os

mmgen/cfgfile.py

@@ -188,7 +188,7 @@ class CfgFileSampleSys(cfg_file_sample):
 		else:
 			# self.fn is used for error msgs only, so file need not exist on filesystem
 			self.fn = os.path.join(os.path.dirname(__file__),'data',self.fn_base)
-			from .globalvars import gc
+			from .cfg import gc
 			self.data = gc.get_mmgen_data_file(self.fn_base).splitlines()
 
 	def make_metadata(self):

mmgen/color.py

@@ -47,7 +47,7 @@ def nocolor(s):
 
 def set_vt100():
 	'hack to put term into VT100 mode under MSWin'
-	from .globalvars import gc
+	from .cfg import gc
 	if gc.platform == 'win':
 		from subprocess import run
 		run([],shell=True)

mmgen/common.py

@@ -21,6 +21,6 @@ common: Common imports for all MMGen scripts
 """
 
 import sys,os
-from .globalvars import *
+from .cfg import *
 import mmgen.opts as opts
 from .util import *

mmgen/crypto.py

@@ -23,7 +23,7 @@ crypto: Random number, password hashing and symmetric encryption routines for th
 import os
 from collections import namedtuple
 
-from .globalvars import gc
+from .cfg import gc
 from .util import (
 	msg,
 	msg_r,

mmgen/daemon.py

@@ -24,7 +24,7 @@ import os,time,importlib
 from subprocess import run,PIPE,CompletedProcess
 from collections import namedtuple
 
-from .globalvars import gc
+from .cfg import gc
 from .color import set_vt100
 from .util import msg,Msg_r,ymsg,die,remove_dups,oneshot_warning
 from .flags import *

mmgen/filename.py

@@ -43,7 +43,7 @@ class File:
 		import stat
 		if stat.S_ISBLK(st.st_mode):
 			mode = (os.O_RDONLY,os.O_RDWR)[bool(write)]
-			from .globalvars import gc
+			from .cfg import gc
 			if gc.platform == 'win':
 				mode |= os.O_BINARY
 			try:

mmgen/fileutil.py

@@ -22,7 +22,7 @@ fileutil: Routines that read, write, execute or stat files
 
 import sys,os
 
-from .globalvars import gc
+from .cfg import gc
 from .color import set_vt100
 from .util import (
 	msg,

mmgen/help.py

@@ -20,7 +20,7 @@
 help: help notes for MMGen suite commands
 """
 
-from .globalvars import gc
+from .cfg import gc
 
 def help_notes_func(proto,cfg,k):
 

mmgen/main.py

@@ -29,7 +29,7 @@ def launch(mod,package='mmgen'):
 		mod = 'addrgen'
 
 	import sys,os
-	from .globalvars import gc
+	from .cfg import gc
 
 	if gc.platform == 'linux' and sys.stdin.isatty():
 		import termios,atexit

mmgen/main_addrgen.py

@@ -22,7 +22,7 @@ mmgen-addrgen: Generate a series or range of addresses from an MMGen
 """
 
 import mmgen.opts as opts
-from .globalvars import gc
+from .cfg import gc,Config
 from .addr import MMGenAddrType
 from .addrfile import AddrFile
 from .wallet import Wallet

mmgen/main_addrimport.py

@@ -23,7 +23,7 @@ mmgen-addrimport: Import addresses into a MMGen coin daemon tracking wallet
 from collections import namedtuple
 
 import mmgen.opts as opts
-from .globalvars import gc
+from .cfg import gc,Config
 from .util import msg,suf,die,fmt,async_run
 from .addrlist import AddrList,KeyAddrList
 from .tw.shared import TwLabel

mmgen/main_passgen.py

@@ -22,7 +22,7 @@ mmgen-passgen: Generate a series or range of passwords from an MMGen
 """
 
 import mmgen.opts as opts
-from .globalvars import gc
+from .cfg import gc,Config
 from .addrlist import AddrIdxList
 from .passwdlist import PasswordList
 from .wallet import Wallet

mmgen/main_regtest.py

@@ -22,7 +22,7 @@ mmgen-regtest: Coin daemon regression test mode setup and operations for the MMG
 """
 
 import mmgen.opts as opts
-from .globalvars import gc
+from .cfg import gc,Config
 from .util import die,async_run
 
 opts_data = {

mmgen/main_seedjoin.py

@@ -22,7 +22,7 @@ mmgen-seedjoin: Regenerate an MMGen deterministic wallet from seed shares
 """
 
 import mmgen.opts as opts
-from .globalvars import gc
+from .cfg import gc,Config
 from .util import msg,msg_r,die
 from .color import yellow
 from .obj import MMGenWalletLabel

mmgen/main_tool.py

@@ -23,7 +23,7 @@ mmgen-tool:  Perform various MMGen- and cryptocoin-related operations.
 
 import sys,os,importlib
 import mmgen.opts as opts
-from .globalvars import gc
+from .cfg import gc,Config
 from .util import msg,Msg,die,capfirst,suf,async_run
 
 opts_data = {

mmgen/main_txbump.py

@@ -22,7 +22,7 @@ mmgen-txbump: Increase the fee on a replaceable (replace-by-fee) MMGen
 """
 
 import mmgen.opts as opts
-from .globalvars import gc
+from .cfg import gc,Config
 from .util import msg,msg_r,die,async_run
 from .color import green
 from .wallet import Wallet

mmgen/main_txcreate.py

@@ -22,7 +22,7 @@ mmgen-txcreate: Create a cryptocoin transaction with MMGen- and/or non-MMGen
 """
 
 import mmgen.opts as opts
-from .globalvars import gc
+from .cfg import gc,Config
 from .util import fmt_list,async_run
 
 opts_data = {

mmgen/main_txdo.py

@@ -21,7 +21,7 @@ mmgen-txdo: Create, sign and broadcast an online MMGen transaction
 """
 
 import mmgen.opts as opts
-from .globalvars import gc
+from .cfg import gc,Config
 from .util import die,fmt_list,async_run
 from .wallet import Wallet
 from .subseed import SubSeedIdxRange

mmgen/main_txsend.py

@@ -23,7 +23,7 @@ mmgen-txsend: Broadcast a transaction signed by 'mmgen-txsign' to the network
 import sys
 
 import mmgen.opts as opts
-from .globalvars import gc
+from .cfg import gc,Config
 from .util import async_run
 
 opts_data = {

mmgen/main_txsign.py

@@ -21,7 +21,7 @@ mmgen-txsign: Sign a transaction generated by 'mmgen-txcreate'
 """
 
 import mmgen.opts as opts
-from .globalvars import gc
+from .cfg import gc,Config
 from .util import msg,ymsg,die,async_run
 from .subseed import SubSeedIdxRange
 from .wallet import Wallet

mmgen/main_wallet.py

@@ -22,7 +22,7 @@ main_wallet: Entry point for MMGen wallet-related scripts
 
 import sys,os
 import mmgen.opts as opts
-from .globalvars import gc
+from .cfg import gc,Config
 from .color import green,yellow
 from .util import msg,gmsg_r,ymsg,bmsg,die,capfirst
 from .wallet import Wallet,get_wallet_cls

mmgen/main_xmrwallet.py

@@ -24,7 +24,7 @@ mmgen-xmrwallet: Perform various Monero wallet operations for addresses
 from collections import namedtuple
 
 import mmgen.opts as opts
-from .globalvars import gc
+from .cfg import gc,Config
 from .util import ymsg,die,async_run
 from .xmrwallet import xmrwallet_uarg_info,MoneroWalletOps
 

mmgen/mn_entry.py

@@ -22,7 +22,7 @@ mn_entry.py - Mnemonic user entry methods for the MMGen suite
 
 import time
 
-from .globalvars import *
+from .cfg import *
 from .util import msg,msg_r,fmt,fmt_list,capfirst,die,ascii_lowercase
 from .term import get_char,get_char_raw
 from .color import cyan

mmgen/msg.py

@@ -13,7 +13,7 @@ msg: base message signing classes
 """
 
 import os,importlib,json
-from .globalvars import gc
+from .cfg import gc
 from .objmethods import MMGenObject,Hilite,InitErrors
 from .util import msg,die,suf,make_chksum_6,fmt_list,remove_dups
 from .color import red,orange,grnbg

mmgen/opts.py

@@ -21,7 +21,7 @@ opts: MMGen-specific options processing after generic processing by share.Opts
 """
 import sys,os
 
-from .globalvars import gc,Config
+from .cfg import gc,Config
 from .base_obj import Lockable
 
 import mmgen.share.Opts

mmgen/proto/btc/daemon.py

@@ -14,7 +14,7 @@ proto.btc.daemon: Bitcoin base protocol daemon classes
 
 import os
 
-from ...globalvars import gc
+from ...cfg import gc
 from ...util import list_gen
 from ...daemon import CoinDaemon,_nw,_dd
 

mmgen/proto/eth/daemon.py

@@ -14,7 +14,7 @@ proto.eth.daemon: Ethereum base protocol daemon classes
 
 import os
 
-from ...globalvars import gc
+from ...cfg import gc
 from ...util import list_gen,get_subclasses
 from ...daemon import CoinDaemon,RPCDaemon,_nw,_dd
 

mmgen/proto/xmr/daemon.py

@@ -14,7 +14,7 @@ proto.xmr.daemon: Monero base protocol daemon classes
 
 import os
 
-from ...globalvars import gc
+from ...cfg import gc
 from ...util import list_gen,die,contains_any
 from ...daemon import CoinDaemon,RPCDaemon,_nw,_dd
 

mmgen/protocol.py

@@ -22,7 +22,7 @@ protocol: Coin protocol base classes and initializer
 
 from collections import namedtuple
 
-from .globalvars import gc
+from .cfg import gc
 from .objmethods import MMGenObject
 
 decoded_wif = namedtuple('decoded_wif',['sec','pubkey_type','compressed'])

mmgen/rpc.py

@@ -24,7 +24,7 @@ import re,base64,json,asyncio,importlib
 from decimal import Decimal
 from collections import namedtuple
 
-from .globalvars import gc
+from .cfg import gc
 from .util import msg,die,fmt,fmt_list,pp_fmt
 from .base_obj import AsyncInit
 from .obj import NonNegativeInt

mmgen/term.py

@@ -25,7 +25,7 @@ term: Terminal classes for the MMGen suite
 import sys,os,time
 from collections import namedtuple
 
-from .globalvars import gc
+from .cfg import gc
 from .util import msg,msg_r,die
 
 try:

mmgen/tool/fileutil.py

@@ -23,7 +23,7 @@ tool.fileutil: File routines for the 'mmgen-tool' utility
 import os
 
 from .common import tool_cmd_base
-from ..globalvars import gc
+from ..cfg import gc
 from ..util import msg,msg_r,die,suf,make_full_path
 from ..crypto import Crypto
 

mmgen/tool/help.py

@@ -133,7 +133,7 @@ def gen_tool_usage():
 
 def gen_tool_cmd_usage(cfg,mod,cmdname):
 
-	from ..globalvars import gc
+	from ..cfg import gc
 	from ..util import capfirst
 
 	cls = main_tool.get_mod_cls(mod)

mmgen/tool/util.py

@@ -20,7 +20,7 @@
 tool.util: Utility commands for the 'mmgen-tool' utility
 """
 
-from ..globalvars import gc
+from ..cfg import gc
 from .common import tool_cmd_base
 
 class tool_cmd(tool_cmd_base):

mmgen/tw/unspent.py

@@ -80,7 +80,7 @@ class TwUnspentOutputs(TwView):
 		await super().__init__(cfg,proto)
 		self.minconf  = minconf
 		self.addrs    = addrs
-		from ..globalvars import gc
+		from ..cfg import gc
 		self.min_cols = gc.min_screen_width
 
 	@property

mmgen/tw/view.py

@@ -515,7 +515,7 @@ class TwView(MMGenObject,metaclass=AsyncInit):
 				for k in self.scroll_keys['vi']:
 					assert k not in self.key_mappings, f'{k!r} is in key_mappings'
 				self.key_mappings.update(self.scroll_keys['vi'])
-				from ..globalvars import gc
+				from ..cfg import gc
 				self.key_mappings.update(self.scroll_keys[gc.platform])
 			return self.key_mappings
 

mmgen/tx/base.py

@@ -12,7 +12,7 @@
 tx.base: base transaction class
 """
 
-from ..globalvars import gc
+from ..cfg import gc
 from ..objmethods import MMGenObject
 from ..obj import (
 	ImmutableAttr,

mmgen/tx/info.py

@@ -12,7 +12,7 @@
 tx.info: transaction info class
 """
 
-from ..globalvars import gc
+from ..cfg import gc
 from ..color import red,green,orange
 from ..util import msg,msg_r
 

mmgen/tx/new.py

@@ -13,7 +13,7 @@ tx.new: new transaction class
 """
 
 from .base import Base
-from ..globalvars import gc
+from ..cfg import gc
 from ..color import pink,yellow
 from ..obj import get_obj,MMGenList
 from ..util import msg,fmt,die,suf,remove_dups,get_extension

mmgen/tx/sign.py

@@ -20,7 +20,7 @@
 tx.sign: Sign a transaction generated by 'mmgen-txcreate'
 """
 
-from ..globalvars import gc
+from ..cfg import gc
 from ..util import msg,suf,fmt,die,remove_dups,get_extension
 from ..obj import MMGenList
 from ..addr import MMGenAddrType

mmgen/ui.py

@@ -14,7 +14,7 @@ ui: Interactive user interface functions for the MMGen suite
 
 import sys,os
 
-from .globalvars import gc
+from .cfg import gc
 from .util import msg,msg_r,Msg,die
 
 def confirm_or_raise(cfg,message,action,expect='YES',exit_msg='Exiting at user request'):

mmgen/util.py

@@ -23,7 +23,7 @@ util: Frequently-used variables, classes and utility functions for the MMGen sui
 import sys,os,time,re
 
 from .color import *
-from .globalvars import gv,gc
+from .cfg import gv,gc
 
 ascii_lowercase = 'abcdefghijklmnopqrstuvwxyz'
 

mmgen/wallet/enc.py

@@ -12,7 +12,7 @@
 wallet.enc: encrypted wallet base class
 """
 
-from ..globalvars import gc
+from ..cfg import gc
 from ..util import msg,make_chksum_8
 from .base import wallet
 

mmgen/wallet/incog_hidden.py

@@ -14,7 +14,7 @@ wallet.incog_hidden: hidden incognito wallet class
 
 import os
 
-from ..globalvars import gc
+from ..cfg import gc
 from ..seed import Seed
 from ..util import msg,die,capfirst
 from ..util2 import parse_bytespec

scripts/uninstall-mmgen.py

@@ -19,7 +19,7 @@
 import sys,os
 
 import mmgen.opts as opts
-from mmgen.globalvars import gc
+from mmgen.cfg import gc,Config
 from mmgen.util import msg,die
 
 def normalize_path(p):

test/gentest.py

@@ -28,7 +28,7 @@ sys.path.insert(0,overlay_setup(repo_root))
 
 # Import these _after_ local path's been added to sys.path
 import mmgen.opts as opts
-from mmgen.globalvars import gc
+from mmgen.cfg import gc,Config
 from mmgen.color import green,red,purple
 from mmgen.util import msg,capfirst,is_int,die
 

test/hashfunc.py

@@ -137,7 +137,7 @@ class TestSha512(TestSha2):
 		0x431d67c49c100d4c, 0x4cc5d4becb3e42b6, 0x597f299cfc657e2a, 0x5fcb6fab3ad6faec, 0x6c44198c4a475817 )
 
 from test.include.common import getrand,set_globals
-from mmgen.globalvars import Config
+from mmgen.cfg import Config
 
 set_globals(Config())
 

test/scrambletest.py

@@ -26,7 +26,7 @@ from subprocess import run,PIPE
 
 from include.tests_header import repo_root
 import mmgen.opts as opts
-from mmgen.globalvars import gc
+from mmgen.cfg import gc,Config
 from mmgen.util import msg,msg_r,bmsg
 
 opts_data = {

test/test_py_d/common.py

@@ -21,7 +21,7 @@ test.test_py_d.common: Shared routines and data for the test.py test suite
 """
 
 import sys,os
-from mmgen.globalvars import gc
+from mmgen.cfg import gc
 from mmgen.util import msg
 from ..include.common import *
 

test/test_py_d/ts_autosign.py

@@ -23,7 +23,7 @@ test.test_py_d.ts_autosign: Autosign tests for the test.py test suite
 import os,shutil
 from subprocess import run
 
-from mmgen.globalvars import gc
+from mmgen.cfg import gc
 
 from ..include.common import *
 from .common import *

test/test_py_d/ts_base.py

@@ -21,7 +21,7 @@ test.test_py_d.ts_base: Base class for the test.py test suite
 """
 
 import os
-from mmgen.globalvars import gc
+from mmgen.cfg import gc
 from ..include.common import *
 from .common import *
 

test/test_py_d/ts_ethdev.py

@@ -25,7 +25,7 @@ from decimal import Decimal
 from collections import namedtuple
 from subprocess import run,PIPE,DEVNULL
 
-from mmgen.globalvars import gc
+from mmgen.cfg import gc
 from mmgen.util import die
 from mmgen.protocol import CoinProtocol
 from ..include.common import *

test/test_py_d/ts_misc.py

@@ -20,7 +20,7 @@
 test.test_py_d.ts_misc: Miscellaneous test groups for the test.py test suite
 """
 
-from mmgen.globalvars import gc
+from mmgen.cfg import gc
 from ..include.common import *
 from .common import *
 from .ts_base import *

test/test_py_d/ts_xmrwallet.py

@@ -23,7 +23,7 @@ test.test_py_d.ts_xmrwallet: xmrwallet tests for the test.py test suite
 import sys,os,atexit,asyncio,shutil
 from subprocess import run,PIPE
 
-from mmgen.globalvars import gc
+from mmgen.cfg import gc
 from mmgen.obj import MMGenRange
 from mmgen.amt import XMRAmt
 from mmgen.addrlist import KeyAddrList,AddrIdxList

test/unit_tests_d/__init__.py

@@ -6,7 +6,7 @@ test.unit_tests_d.__init__: shared data for unit tests for the MMGen suite
 
 import sys,os
 
-from mmgen.globalvars import gv
+from mmgen.cfg import gv
 from ..include.common import cfg
 
 class unit_tests_base: