From 7b765133e74db115b2585718c224834194897cbb Mon Sep 17 00:00:00 2001 From: derekpierre Date: Wed, 8 May 2019 14:06:22 -0400 Subject: [PATCH] Moe/Ursula Status App: move package to be under network --- nucypher/characters/chaotic.py | 2 +- nucypher/characters/lawful.py | 3 ++- nucypher/{ => network}/status/__init__.py | 0 nucypher/{ => network}/status/assets/bWLwgP.css | 0 nucypher/{ => network}/status/assets/favicon.ico | Bin .../{ => network}/status/assets/hendrix-update.js | 0 .../{ => network}/status/assets/nucypher_logo.png | Bin nucypher/{ => network}/status/assets/stylesheet.css | 0 nucypher/{ => network}/status/status_app.py | 0 9 files changed, 3 insertions(+), 2 deletions(-) rename nucypher/{ => network}/status/__init__.py (100%) rename nucypher/{ => network}/status/assets/bWLwgP.css (100%) rename nucypher/{ => network}/status/assets/favicon.ico (100%) rename nucypher/{ => network}/status/assets/hendrix-update.js (100%) rename nucypher/{ => network}/status/assets/nucypher_logo.png (100%) rename nucypher/{ => network}/status/assets/stylesheet.css (100%) rename nucypher/{ => network}/status/status_app.py (100%) diff --git a/nucypher/characters/chaotic.py b/nucypher/characters/chaotic.py index 11d64b1f2..955ea5e42 100644 --- a/nucypher/characters/chaotic.py +++ b/nucypher/characters/chaotic.py @@ -34,7 +34,7 @@ from nucypher.config.constants import TEMPLATES_DIR from nucypher.crypto.powers import SigningPower, TransactingPower from nucypher.keystore.threading import ThreadedSession from nucypher.network.nodes import FleetStateTracker -from nucypher.status.status_app import MoeStatusApp +from nucypher.network.status.status_app import MoeStatusApp class Moe(Character): diff --git a/nucypher/characters/lawful.py b/nucypher/characters/lawful.py index 1aa82bdc7..80591ed19 100644 --- a/nucypher/characters/lawful.py +++ b/nucypher/characters/lawful.py @@ -34,6 +34,7 @@ from cryptography.hazmat.primitives.serialization import Encoding from cryptography.x509 import load_pem_x509_certificate, Certificate, NameOID from eth_utils import to_checksum_address from flask import request, Response +from nucypher.status.status_app import UrsulaStatusApp from twisted.internet import threads from twisted.logger import Logger from umbral.keys import UmbralPublicKey @@ -68,8 +69,8 @@ from nucypher.network.nicknames import nickname_from_seed from nucypher.network.nodes import Teacher from nucypher.network.protocols import InterfaceInfo, parse_node_uri from nucypher.network.server import ProxyRESTServer, TLSHostingPower, make_rest_app -from nucypher.status.status_app import UrsulaStatusApp from nucypher.blockchain.eth.decorators import validate_checksum_address +from nucypher.network.status.status_app import UrsulaStatusApp class Alice(Character, BlockchainPolicyAuthor): diff --git a/nucypher/status/__init__.py b/nucypher/network/status/__init__.py similarity index 100% rename from nucypher/status/__init__.py rename to nucypher/network/status/__init__.py diff --git a/nucypher/status/assets/bWLwgP.css b/nucypher/network/status/assets/bWLwgP.css similarity index 100% rename from nucypher/status/assets/bWLwgP.css rename to nucypher/network/status/assets/bWLwgP.css diff --git a/nucypher/status/assets/favicon.ico b/nucypher/network/status/assets/favicon.ico similarity index 100% rename from nucypher/status/assets/favicon.ico rename to nucypher/network/status/assets/favicon.ico diff --git a/nucypher/status/assets/hendrix-update.js b/nucypher/network/status/assets/hendrix-update.js similarity index 100% rename from nucypher/status/assets/hendrix-update.js rename to nucypher/network/status/assets/hendrix-update.js diff --git a/nucypher/status/assets/nucypher_logo.png b/nucypher/network/status/assets/nucypher_logo.png similarity index 100% rename from nucypher/status/assets/nucypher_logo.png rename to nucypher/network/status/assets/nucypher_logo.png diff --git a/nucypher/status/assets/stylesheet.css b/nucypher/network/status/assets/stylesheet.css similarity index 100% rename from nucypher/status/assets/stylesheet.css rename to nucypher/network/status/assets/stylesheet.css diff --git a/nucypher/status/status_app.py b/nucypher/network/status/status_app.py similarity index 100% rename from nucypher/status/status_app.py rename to nucypher/network/status/status_app.py