From ac02cf66a6763d61f1f1ebe7f236bb8f87843636 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Tue, 10 Dec 2019 18:16:56 +0000 Subject: [PATCH] file rename: test_daemon.py -> daemon.py --- mmgen/{test_daemon.py => daemon.py} | 2 +- mmgen/main_autosign.py | 2 +- mmgen/regtest.py | 2 +- setup.py | 2 +- test/common.py | 2 +- test/start-coin-daemons.py | 2 +- test/test.py | 2 +- test/test_py_d/ts_ethdev.py | 2 +- test/test_py_d/ts_ref_altcoin.py | 2 +- test/unit_tests_d/ut_tx_deserialize.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename mmgen/{test_daemon.py => daemon.py} (99%) diff --git a/mmgen/test_daemon.py b/mmgen/daemon.py similarity index 99% rename from mmgen/test_daemon.py rename to mmgen/daemon.py index 40d5a97d..41b4d923 100755 --- a/mmgen/test_daemon.py +++ b/mmgen/daemon.py @@ -17,7 +17,7 @@ # along with this program. If not, see . """ -test_daemon.py: Daemon control classes for MMGen test suite and regtest mode +daemon.py: Daemon control interface for the MMGen suite """ import shutil diff --git a/mmgen/main_autosign.py b/mmgen/main_autosign.py index 424a06f4..da59613e 100755 --- a/mmgen/main_autosign.py +++ b/mmgen/main_autosign.py @@ -114,7 +114,7 @@ import mmgen.altcoins.eth.tx from mmgen.txsign import txsign from mmgen.protocol import CoinProtocol,init_coin if g.test_suite: - from mmgen.test_daemon import TestDaemon + from mmgen.daemon import TestDaemon if opt.stealth_led: opt.led = True diff --git a/mmgen/regtest.py b/mmgen/regtest.py index 889ecfb7..e5faeeb2 100755 --- a/mmgen/regtest.py +++ b/mmgen/regtest.py @@ -23,7 +23,7 @@ regtest: Coin daemon regression test mode setup and operations for the MMGen sui import os,time,shutil,re,json from subprocess import run,PIPE from mmgen.common import * -from mmgen.test_daemon import TestDaemon +from mmgen.daemon import TestDaemon # To enforce MMGen policy that all testing must ignore the user's ~/.bitcoin # dir, locate the daemon datadir under MMGen data_dir: diff --git a/setup.py b/setup.py index ff25930d..34f1788a 100755 --- a/setup.py +++ b/setup.py @@ -122,7 +122,7 @@ setup( 'mmgen.seed', 'mmgen.sha2', 'mmgen.term', - 'mmgen.test_daemon', + 'mmgen.daemon', 'mmgen.tool', 'mmgen.tw', 'mmgen.tx', diff --git a/test/common.py b/test/common.py index 01697f89..76189822 100755 --- a/test/common.py +++ b/test/common.py @@ -174,7 +174,7 @@ def stop_test_daemons(*network_ids): def test_daemons_ops(*network_ids,op): if opt.no_daemon_autostart: return - from mmgen.test_daemon import TestDaemon + from mmgen.daemon import TestDaemon repo_root = os.path.normpath(os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]),os.pardir))) silent = not opt.verbose and not (hasattr(opt,'exact_output') and opt.exact_output) for network_id in network_ids: diff --git a/test/start-coin-daemons.py b/test/start-coin-daemons.py index 99bd3575..64553fc3 100755 --- a/test/start-coin-daemons.py +++ b/test/start-coin-daemons.py @@ -3,7 +3,7 @@ import sys from tests_header import repo_root from mmgen.common import * -from mmgen.test_daemon import TestDaemon +from mmgen.daemon import TestDaemon from mmgen.regtest import MMGenRegtest action = g.prog_name.split('-')[0] diff --git a/test/test.py b/test/test.py index b9388af3..44869c5e 100755 --- a/test/test.py +++ b/test/test.py @@ -77,7 +77,7 @@ try: os.unlink(os.path.join(repo_root,'my.err')) except: pass from mmgen.common import * -from mmgen.test_daemon import TestDaemon +from mmgen.daemon import TestDaemon from test.common import * from test.test_py_d.common import * diff --git a/test/test_py_d/ts_ethdev.py b/test/test_py_d/ts_ethdev.py index a79bdacc..4aba6bf3 100755 --- a/test/test_py_d/ts_ethdev.py +++ b/test/test_py_d/ts_ethdev.py @@ -299,7 +299,7 @@ class TestSuiteEthdev(TestSuiteBase,TestSuiteShared): ) def __init__(self,trunner,cfgs,spawn): - from mmgen.test_daemon import TestDaemon + from mmgen.daemon import TestDaemon self.rpc_port = TestDaemon(g.coin).rpc_port os.environ['MMGEN_BOGUS_WALLET_DATA'] = '' return TestSuiteBase.__init__(self,trunner,cfgs,spawn) diff --git a/test/test_py_d/ts_ref_altcoin.py b/test/test_py_d/ts_ref_altcoin.py index ea3ef2d9..51b03a32 100755 --- a/test/test_py_d/ts_ref_altcoin.py +++ b/test/test_py_d/ts_ref_altcoin.py @@ -84,7 +84,7 @@ class TestSuiteRefAltcoin(TestSuiteRef,TestSuiteBase): self.write_to_tmpfile(pwfile,dfl_wpasswd) pf = joinpath(self.tmpdir,pwfile) from mmgen.protocol import init_coin - from mmgen.test_daemon import TestDaemon + from mmgen.daemon import TestDaemon for k in ('bch','eth','mm1','etc'): coin,token = ('eth','mm1') if k == 'mm1' else (k,None) ref_subdir = self._get_ref_subdir_by_coin(coin) diff --git a/test/unit_tests_d/ut_tx_deserialize.py b/test/unit_tests_d/ut_tx_deserialize.py index 4371360d..b5c98936 100755 --- a/test/unit_tests_d/ut_tx_deserialize.py +++ b/test/unit_tests_d/ut_tx_deserialize.py @@ -107,7 +107,7 @@ class unit_test(object): ('bch',False,'test/ref/460D4D-BCH[10.19764,tl=1320969600].rawtx') ) from mmgen.protocol import init_coin from mmgen.tx import MMGenTX - from mmgen.test_daemon import TestDaemon + from mmgen.daemon import TestDaemon print_info('test/ref/*rawtx','MMGen reference transactions') for n,(coin,tn,fn) in enumerate(fns): init_coin(coin,tn)