main: don’t handle non-zero SystemExit; cmdtest ethdev: minor cleanup

mmgen/main.py

@@ -70,9 +70,3 @@ def launch(*, mod=None, func=None, fqmod=None, package='mmgen'):
 			raise
 
 		sys.exit(d.exit_val)
-
-	except SystemExit as e:
-		if os.getenv('MMGEN_EXEC_WRAPPER') and e.code != 0:
-			from .color import red
-			sys.stdout.write(red(f'{type(e).__name__}: {e}\n'))
-		raise

test/cmdtest_py_d/ct_ethdev.py

@@ -566,6 +566,11 @@ class CmdTestEthdev(CmdTestBase,CmdTestShared):
 		write_to_file( self.genesis_fn, json.dumps(genesis_data,indent='  ')+'\n' )
 		init_genesis(self.genesis_fn)
 
+	def daemon_version(self):
+		t = self.spawn('mmgen-tool', self.eth_args + ['daemon_version'])
+		t.expect('version')
+		return t
+
 	async def _wallet_upgrade(self, src_fn, expect1, expect2=None):
 		if self.proto.coin == 'ETC':
 			msg(f'skipping test {self.test_name!r} for ETC')
@@ -585,11 +590,6 @@ class CmdTestEthdev(CmdTestBase,CmdTestShared):
 		twctl.tw_path.rename(bak_fn)
 		return t
 
-	def daemon_version(self):
-		t = self.spawn('mmgen-tool', self.eth_args + ['daemon_version'])
-		t.expect('version')
-		return t
-
 	async def wallet_upgrade1(self):
 		return await self._wallet_upgrade('tracking-wallet-v1.json', 'accounts field', 'network field')