diff --git a/src/httpapi/miscclientapi/endpoints.py b/src/httpapi/miscclientapi/endpoints.py index 576d619f..124d2272 100644 --- a/src/httpapi/miscclientapi/endpoints.py +++ b/src/httpapi/miscclientapi/endpoints.py @@ -26,7 +26,7 @@ import unpaddedbase32 from httpapi import apiutils import onionrcrypto, config from netcontroller import NetController -from statistics.serializeddata import SerializedData +from onionrstatistics.serializeddata import SerializedData from onionrutils import mnemonickeys from onionrutils import bytesconverter from etc import onionrvalues diff --git a/src/httpapi/sse/private/__init__.py b/src/httpapi/sse/private/__init__.py index 804748f8..e9011e92 100644 --- a/src/httpapi/sse/private/__init__.py +++ b/src/httpapi/sse/private/__init__.py @@ -4,9 +4,8 @@ SSE API for node client access """ from flask import g, Blueprint from gevent import sleep -#from time import sleep -from statistics.transports.tor import TorStats +from onionrstatistics.transports.tor import TorStats from .. import wrapper """ This program is free software: you can redistribute it and/or modify diff --git a/src/onionrcommands/daemonlaunch.py b/src/onionrcommands/daemonlaunch.py index 679f94be..4dd705f8 100755 --- a/src/onionrcommands/daemonlaunch.py +++ b/src/onionrcommands/daemonlaunch.py @@ -13,7 +13,8 @@ from gevent import spawn import toomanyobjs import config -from statistics.transports.tor import TorStats +import onionrstatistics +from onionrstatistics import serializeddata import apiservers import logger import communicator @@ -25,7 +26,6 @@ from etc import onionrvalues, cleanup from onionrcrypto import getourkeypair from utils import hastor, logoheader from . import version -from statistics import serializeddata import runtests from httpapi import daemoneventsapi """ @@ -106,7 +106,7 @@ def daemon(): apiServerIP=apiHost) shared_state.add(net) - shared_state.get(TorStats) + shared_state.get(onionrstatistics.tor.TorStats) if not offline_mode: logger.info('Tor is starting...', terminal=True) diff --git a/src/onionrstatistics/__init__.py b/src/onionrstatistics/__init__.py new file mode 100644 index 00000000..e65b792c --- /dev/null +++ b/src/onionrstatistics/__init__.py @@ -0,0 +1 @@ +from .transports import tor \ No newline at end of file diff --git a/src/statistics/serializeddata.py b/src/onionrstatistics/serializeddata.py similarity index 100% rename from src/statistics/serializeddata.py rename to src/onionrstatistics/serializeddata.py diff --git a/src/statistics/transports/__init__.py b/src/onionrstatistics/transports/__init__.py similarity index 100% rename from src/statistics/transports/__init__.py rename to src/onionrstatistics/transports/__init__.py diff --git a/src/statistics/transports/tor/__init__.py b/src/onionrstatistics/transports/tor/__init__.py similarity index 100% rename from src/statistics/transports/tor/__init__.py rename to src/onionrstatistics/transports/tor/__init__.py diff --git a/src/statistics/__init__.py b/src/statistics/__init__.py deleted file mode 100644 index e69de29b..00000000