Browse Source

a few minor fixes

The MMGen Project 1 year ago
parent
commit
0e669c3ef8
3 changed files with 4 additions and 5 deletions
  1. 2 3
      mmgen/main_xmrwallet.py
  2. 1 1
      test/test_py_d/ts_regtest.py
  3. 1 1
      test/unit_tests_d/ut_testdep.py

+ 2 - 3
mmgen/main_xmrwallet.py

@@ -124,9 +124,6 @@ op     = cmd_args.pop(0)
 infile = cmd_args.pop(0)
 wallets = spec = None
 
-if op.replace('-','_') not in MoneroWalletOps.ops:
-	die(1,f'{op!r}: unrecognized operation')
-
 if op in ('relay','submit','resubmit'):
 	if len(cmd_args) != 0:
 		cfg._opts.usage()
@@ -146,6 +143,8 @@ elif op in ('export-outputs','import-key-images'):
 	if len(cmd_args) > 1:
 		cfg._opts.usage()
 	wallets = cmd_args.pop(0) if cmd_args else None
+else:
+	die(1,f'{op!r}: unrecognized operation')
 
 op_cls = getattr(MoneroWalletOps,op.replace('-','_'))
 

+ 1 - 1
test/test_py_d/ts_regtest.py

@@ -788,7 +788,7 @@ class TestSuiteRegtest(TestSuiteBase,TestSuiteShared):
 		for resp in ('u','i','t','a','m','T','A','r','r','D','D','D','D','p','P','n','V'):
 			t.expect('draw:\b',resp,regex=True)
 		if t.pexpect_spawn:
-			t.expect(r'Block:.*\b394\b',regex=True)
+			t.expect(r'Block:.*394',regex=True)
 			time.sleep(1)
 			t.send('q')
 			time.sleep(0.2)

+ 1 - 1
test/unit_tests_d/ut_testdep.py

@@ -12,7 +12,7 @@ sec = 'deadbeef' * 8
 class unit_tests:
 
 	altcoin_deps = ('pycoin','monero_python','keyconv','zcash_mini','ethkey','ssh_socks_proxy')
-	win_skip = ('losetup','monero_python','zcash_mini')
+	win_skip = ('losetup','zcash_mini')
 
 	def core_repo(self,name,ut):
 		crr = os.getenv('CORE_REPO_ROOT')