reorg files and cleaned up files

api/api/api_v1.py

@@ -43,6 +43,7 @@ from .parameters import parameters_required
 from .dkim import dns_resolver, parse_pubkey_from_data, DKIM_RECORD_PREFIX
 from .utils import zone_file_is_too_big
 from .s3 import s3_upload_file
+from ..resolver.server import get_users
 
 from .settings import (
     RESOLVER_URL, SEARCH_URL,

api/resolver/server.py

@@ -301,8 +301,8 @@ def get_all_users():
     return data
 
 
-@app.route('/v2/users/<usernames>', methods=['GET'], strict_slashes=False)
-@crossdomain(origin='*')
+#@app.route('/v2/users/<usernames>', methods=['GET'], strict_slashes=False)
+#@crossdomain(origin='*')
 def get_users(usernames):
     """ Fetch data from username in .id namespace
     """

resolver/runserver.py

@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""
-    Resolver
-    ~~~~~
-    :copyright: (c) 2014-2016 by Halfmoon Labs, Inc.
-    :copyright: (c) 2016 blockstack.org
-    :license: MIT, see LICENSE for more details.
-"""
-
-import os
-from resolver.server import app
-from resolver.config import DEFAULT_HOST, DEFAULT_PORT, DEBUG
-
-
-# ------------------------------
-def runserver():
-
-    port = int(os.environ.get('PORT', DEFAULT_PORT))
-    app.run(host=DEFAULT_HOST, port=port, debug=DEBUG)
-
-# ------------------------------
-if __name__ == '__main__':
-
-    runserver()