@@ -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:
wallets = cmd_args.pop(0) if cmd_args else None
+else:
+ die(1,f'{op!r}: unrecognized operation')
op_cls = getattr(MoneroWalletOps,op.replace('-','_'))
@@ -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)
@@ -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')