diff --git a/blockstack_client/actions.py b/blockstack_client/actions.py index ef3360b6f..955d594f2 100644 --- a/blockstack_client/actions.py +++ b/blockstack_client/actions.py @@ -2168,7 +2168,7 @@ def cli_delete_account( args, proxy=None, config_path=CONFIG_PATH, password=None if len(args.service) == 0 or len(args.identifier) == 0: return {'error': 'Invalid data'} - return profile_delete_account(name, service, identifier, config_path=config_path, proxy=proxy) + return profile_delete_account(name, service, identifier, wallet_keys, config_path=config_path, proxy=proxy) def cli_import_wallet(args, config_path=CONFIG_PATH, password=None, force=False): diff --git a/integration_tests/blockstack_integration_tests/scenarios/rpc_register_cli_queries.py b/integration_tests/blockstack_integration_tests/scenarios/rpc_register_cli_queries.py index b09bd4b19..fd7326017 100644 --- a/integration_tests/blockstack_integration_tests/scenarios/rpc_register_cli_queries.py +++ b/integration_tests/blockstack_integration_tests/scenarios/rpc_register_cli_queries.py @@ -294,14 +294,10 @@ def check( state_engine ): return False # zonefile info - if zonefile_info is None or type(zonefile_info) != dict: + if zonefile_info is None or type(zonefile_info) != str: print "invalid zonefile\n%s\n" % zonefile_info return False - if not zonefile_info.has_key('zonefile'): - print "missing zonefile\n%s\n" % zonefile_info - return False - # name query if type(all_names_info) == dict and 'error' in all_names_info: print "error in all_names: %s" % all_names_info @@ -334,8 +330,8 @@ def check( state_engine ): print "missing '%s'\n%s" % (k, json.dumps(lookup_info, indent=4, sort_keys=True)) return False - if lookup_info['zonefile'] != zonefile_info['zonefile']: - print "unequal zonefiles:\n%s\n%s" % (json.dumps(lookup_info['zonefile'], indent=4, sort_keys=True), json.dumps(zonefile_info['zonefile'], indent=4, sort_keys=True)) + if lookup_info['zonefile'] != zonefile_info: + print "unequal zonefiles:\n%s\n%s" % (json.dumps(lookup_info['zonefile'], indent=4, sort_keys=True), json.dumps(zonefile_info, indent=4, sort_keys=True)) return False # update history (2 items) @@ -344,8 +340,9 @@ def check( state_engine ): return False # zonefile history (expect 2 items) - if len(zonefile_history) != 2 or zonefile_history[1] != zonefile_info['zonefile']: + if len(zonefile_history) != 2 or zonefile_history[1] != zonefile_info: print "invalid zonefile history\n%s" % json.dumps(zonefile_history, indent=4, sort_keys=True) + print "zonefile current:\n%s" % json.dumps(zonefile_info, indent=4, sort_keys=True) return False # names info