From 59c96fb16bbf92d9abacf8855d547ad5fae44b92 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Thu, 29 Jul 2021 14:30:23 +0000 Subject: [PATCH] daemon.py: temporarily disable ETC (Ethereum Classic) support --- mmgen/daemon.py | 6 +++--- test/start-coin-daemons.py | 4 ---- test/test-release.sh | 2 +- test/test_py_d/ts_ethdev.py | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/mmgen/daemon.py b/mmgen/daemon.py index 06c4de54..4e765df8 100755 --- a/mmgen/daemon.py +++ b/mmgen/daemon.py @@ -332,7 +332,7 @@ class CoinDaemon(Daemon): 'LTC': _cd('Litecoin', ['litecoin_core']), 'XMR': _cd('Monero', ['monero']), 'ETH': _cd('Ethereum', ['openethereum']), - 'ETC': _cd('Ethereum Classic', ['openethereum_etc']), +# 'ETC': _cd('Ethereum Classic', ['openethereum_etc']), } @classmethod @@ -672,7 +672,7 @@ class openethereum_daemon(CoinDaemon): def stop_cmd(self): return ['kill','-Wf',self.pid] if self.platform == 'win' else ['kill',self.pid] -class openethereum_etc_daemon(openethereum_daemon): - rpc_ports = _pd(*[8645 + n for n in openethereum_daemon.ports_shift.values()]) +# class openethereum_etc_daemon(openethereum_daemon): +# rpc_ports = _pd(*[8645 + n for n in openethereum_daemon.ports_shift.values()]) CoinDaemon.check_implement() diff --git a/test/start-coin-daemons.py b/test/start-coin-daemons.py index 7511e5a7..4f687122 100755 --- a/test/start-coin-daemons.py +++ b/test/start-coin-daemons.py @@ -53,10 +53,6 @@ else: if i not in network_ids: die(1,f'{i!r}: invalid network ID') -if 'eth' in ids and 'etc' in ids: - msg('Cannot run ETH and ETC simultaneously, so skipping ETC') - ids.remove('etc') - for network_id in ids: network_id = network_id.lower() d = CoinDaemon( diff --git a/test/test-release.sh b/test/test-release.sh index b95a47b9..6a1e4118 100755 --- a/test/test-release.sh +++ b/test/test-release.sh @@ -36,7 +36,7 @@ python='python3' rounds=100 rounds_min=20 rounds_mid=250 rounds_max=500 dfl_tests='misc obj color unit hash ref altref alts xmr eth autosign btc btc_tn btc_rt bch bch_rt ltc ltc_rt tool tool2 gen' -extra_tests='autosign_btc autosign_live etc ltc_tn bch_tn' +extra_tests='autosign_btc autosign_live ltc_tn bch_tn' # 'etc' temporarily disabled noalt_tests='misc obj color unit hash ref autosign_btc btc btc_tn btc_rt tool tool2 gen' quick_tests='misc obj color unit hash ref altref alts xmr eth autosign btc btc_rt tool tool2 gen' qskip_tests='btc_tn bch bch_rt ltc ltc_rt' diff --git a/test/test_py_d/ts_ethdev.py b/test/test_py_d/ts_ethdev.py index ca8d5bf0..835c361d 100755 --- a/test/test_py_d/ts_ethdev.py +++ b/test/test_py_d/ts_ethdev.py @@ -138,7 +138,7 @@ coin = g.coin class TestSuiteEthdev(TestSuiteBase,TestSuiteShared): 'Ethereum transacting, token deployment and tracking wallet operations' - networks = ('eth','etc') + networks = ('eth',) # 'etc' temporarily disabled passthru_opts = ('coin',) extra_spawn_args = ['--regtest=1'] tmpdir_nums = [22]