diff --git a/mmgen/opts.py b/mmgen/opts.py index 4bdaa288..59a712bd 100755 --- a/mmgen/opts.py +++ b/mmgen/opts.py @@ -267,6 +267,8 @@ def init(opts_data,add_opts=[],opt_filter=None,parse_only=False): if g.regtest: g.testnet = True # These are equivalent for now + g.network = 'testnet' if g.testnet else 'mainnet' + from mmgen.protocol import init_genonly_altcoins,CoinProtocol altcoin_trust_level = init_genonly_altcoins(opt.coin) diff --git a/test/objattrtest.py b/test/objattrtest.py index 19ed19cb..9bb836e7 100755 --- a/test/objattrtest.py +++ b/test/objattrtest.py @@ -147,10 +147,9 @@ def test_object(test_data,objname): def do_loop(): import importlib - network = ('mainnet','testnet')[bool(g.testnet)] - modname = 'test.objattrtest_py_d.oat_{}_{}'.format(g.coin.lower(),network) + modname = 'test.objattrtest_py_d.oat_{}_{}'.format(g.coin.lower(),g.network) test_data = importlib.import_module(modname).tests - gmsg('Running immutable attribute tests for {} {}'.format(g.coin,network)) + gmsg('Running immutable attribute tests for {} {}'.format(g.coin,g.network)) utests = cmd_args for obj in test_data: diff --git a/test/objtest.py b/test/objtest.py index 9b3cfd1c..bc7300fa 100755 --- a/test/objtest.py +++ b/test/objtest.py @@ -116,10 +116,9 @@ def run_test(test,arg,input_data): def do_loop(): import importlib - network = ('mainnet','testnet')[bool(g.testnet)] - modname = 'test.objtest_py_d.ot_{}_{}'.format(g.coin.lower(),network) + modname = 'test.objtest_py_d.ot_{}_{}'.format(g.coin.lower(),g.network) test_data = importlib.import_module(modname).tests - gmsg('Running data object tests for {} {}'.format(g.coin,network)) + gmsg('Running data object tests for {} {}'.format(g.coin,g.network)) clr = None utests = cmd_args