progress in removing core

onionr/apiservers/private/__init__.py

@@ -20,9 +20,8 @@
 import base64, os
 import flask
 from gevent.pywsgi import WSGIServer
-import logger
 from onionrutils import epoch
-import httpapi
+import httpapi, filepaths, logger
 from . import register_private_blueprints
 class PrivateAPI:
     '''
@@ -41,9 +40,8 @@ class PrivateAPI:
         config = onionrInst.config
         self.config = config
         self.debug = debug
-        self._core = onionrInst.onionrCore
         self.startTime = epoch.get_epoch()
-        self._crypto = self._core._crypto
+        self._crypto = onionrInst.onionrCrypto
         app = flask.Flask(__name__)
         bindPort = int(config.get('client.client.port', 59496))
         self.bindPort = bindPort
@@ -53,7 +51,7 @@ class PrivateAPI:
 
         self.publicAPI = None # gets set when the thread calls our setter... bad hack but kinda necessary with flask
         #threading.Thread(target=PublicAPI, args=(self,)).start()
-        self.host = httpapi.apiutils.setbindip.set_bind_IP(self._core.privateApiHostFile, self._core)
+        self.host = httpapi.apiutils.setbindip.set_bind_IP(filepaths.private_API_host_file)
         logger.info('Running api on %s:%s' % (self.host, self.bindPort))
         self.httpServer = ''
 

onionr/apiservers/public/__init__.py

@@ -21,7 +21,8 @@ import time
 import flask
 from gevent.pywsgi import WSGIServer
 from httpapi import apiutils, security, fdsafehandler, miscpublicapi
-import logger, onionr
+import logger, onionr, filepaths
+from utils import gettransports
 class PublicAPI:
     '''
         The new client api server, isolated from the public api
@@ -32,9 +33,8 @@ class PublicAPI:
         app.config['MAX_CONTENT_LENGTH'] = 5 * 1024 * 1024
         self.i2pEnabled = config.get('i2p.host', False)
         self.hideBlocks = [] # Blocks to be denied sharing
-        self.host = apiutils.setbindip.set_bind_IP(clientAPI._core.publicApiHostFile, clientAPI._core)
-        self.torAdder = clientAPI._core.hsAddress
-        self.i2pAdder = clientAPI._core.i2pAddress
+        self.host = apiutils.setbindip.set_bind_IP(filepaths.public_API_host_file)
+        self.torAdder = gettransports.get_transports[0]
         self.bindPort = config.get('client.public.port')
         self.lastRequest = 0
         self.hitCount = 0 # total rec requests to public api since server started
@@ -45,10 +45,6 @@ class PublicAPI:
 
         # Set instances, then startup our public api server
         clientAPI.setPublicAPIInstance(self)
-        while self.torAdder == '':
-            clientAPI._core.refreshFirstStartVars()
-            self.torAdder = clientAPI._core.hsAddress
-            time.sleep(0.1)
         
         app.register_blueprint(security.public.PublicAPISecurity(self).public_api_security_bp)
         app.register_blueprint(miscpublicapi.endpoints.PublicEndpoints(self).public_endpoints_bp)