From 5e5ff0278ad6e73156d389e8580c92318f258d62 Mon Sep 17 00:00:00 2001 From: Sergi Delgado Segura Date: Wed, 18 Mar 2020 12:09:58 +0100 Subject: [PATCH] Removes apps folder --- .gitignore | 2 +- {apps/cli => cli}/DEPENDENCIES.md | 0 {apps/cli => cli}/INSTALL.md | 0 {apps/cli => cli}/README.md | 0 {apps/cli => cli}/TEOS-API.md | 0 {apps/cli => cli}/__init__.py | 2 +- {apps/cli => cli}/help.py | 0 {apps/cli => cli}/requirements-dev.txt | 0 {apps/cli => cli}/requirements.txt | 0 {apps/cli => cli}/sample_conf.py | 0 {apps/cli => cli}/teos_cli.py | 4 ++-- apps/generate_key.py => generate_keys.py | 14 +++++++++++--- test/apps/cli/__init__.py | 0 test/apps/cli/unit/__init__.py | 0 {apps => test/cli}/__init__.py | 0 test/{apps => cli/unit}/__init__.py | 0 test/{apps => }/cli/unit/conftest.py | 0 test/{apps => }/cli/unit/test_teos_cli.py | 4 ++-- test/teos/e2e/test_basic_e2e.py | 4 ++-- 19 files changed, 19 insertions(+), 11 deletions(-) rename {apps/cli => cli}/DEPENDENCIES.md (100%) rename {apps/cli => cli}/INSTALL.md (100%) rename {apps/cli => cli}/README.md (100%) rename {apps/cli => cli}/TEOS-API.md (100%) rename {apps/cli => cli}/__init__.py (97%) rename {apps/cli => cli}/help.py (100%) rename {apps/cli => cli}/requirements-dev.txt (100%) rename {apps/cli => cli}/requirements.txt (100%) rename {apps/cli => cli}/sample_conf.py (100%) rename {apps/cli => cli}/teos_cli.py (99%) rename apps/generate_key.py => generate_keys.py (79%) delete mode 100644 test/apps/cli/__init__.py delete mode 100644 test/apps/cli/unit/__init__.py rename {apps => test/cli}/__init__.py (100%) rename test/{apps => cli/unit}/__init__.py (100%) rename test/{apps => }/cli/unit/conftest.py (100%) rename test/{apps => }/cli/unit/test_teos_cli.py (98%) diff --git a/.gitignore b/.gitignore index 9dac4f1..fb8a68f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ conf.py bitcoin.conf* *__pycache__ .pending* -apps/cli/*.json +cli/*.json appointments/ test.py *.pyc diff --git a/apps/cli/DEPENDENCIES.md b/cli/DEPENDENCIES.md similarity index 100% rename from apps/cli/DEPENDENCIES.md rename to cli/DEPENDENCIES.md diff --git a/apps/cli/INSTALL.md b/cli/INSTALL.md similarity index 100% rename from apps/cli/INSTALL.md rename to cli/INSTALL.md diff --git a/apps/cli/README.md b/cli/README.md similarity index 100% rename from apps/cli/README.md rename to cli/README.md diff --git a/apps/cli/TEOS-API.md b/cli/TEOS-API.md similarity index 100% rename from apps/cli/TEOS-API.md rename to cli/TEOS-API.md diff --git a/apps/cli/__init__.py b/cli/__init__.py similarity index 97% rename from apps/cli/__init__.py rename to cli/__init__.py index 76d2246..925027f 100644 --- a/apps/cli/__init__.py +++ b/cli/__init__.py @@ -1,5 +1,5 @@ import os -import apps.cli.conf as conf +import cli.conf as conf from common.tools import extend_paths, check_conf_fields, setup_logging, setup_data_folder LOG_PREFIX = "cli" diff --git a/apps/cli/help.py b/cli/help.py similarity index 100% rename from apps/cli/help.py rename to cli/help.py diff --git a/apps/cli/requirements-dev.txt b/cli/requirements-dev.txt similarity index 100% rename from apps/cli/requirements-dev.txt rename to cli/requirements-dev.txt diff --git a/apps/cli/requirements.txt b/cli/requirements.txt similarity index 100% rename from apps/cli/requirements.txt rename to cli/requirements.txt diff --git a/apps/cli/sample_conf.py b/cli/sample_conf.py similarity index 100% rename from apps/cli/sample_conf.py rename to cli/sample_conf.py diff --git a/apps/cli/teos_cli.py b/cli/teos_cli.py similarity index 99% rename from apps/cli/teos_cli.py rename to cli/teos_cli.py index d1d15f0..bbfbd68 100644 --- a/apps/cli/teos_cli.py +++ b/cli/teos_cli.py @@ -10,8 +10,8 @@ from coincurve import PublicKey from getopt import getopt, GetoptError from requests import ConnectTimeout, ConnectionError -from apps.cli import config, LOG_PREFIX -from apps.cli.help import help_add_appointment, help_get_appointment +from cli import config, LOG_PREFIX +from cli.help import help_add_appointment, help_get_appointment from common.blob import Blob import common.cryptographer diff --git a/apps/generate_key.py b/generate_keys.py similarity index 79% rename from apps/generate_key.py rename to generate_keys.py index 5a6b449..762f142 100644 --- a/apps/generate_key.py +++ b/generate_keys.py @@ -7,8 +7,16 @@ from cryptography.hazmat.primitives import serialization from cryptography.hazmat.primitives.asymmetric import ec -# Simple tool to generate an ECDSA private key using the secp256k1 curve and save private and public keys -# as 'teos_sk.der' 'and teos_pk.der', respectively. +""" +Simple too to generate an ECDSA key pair using the secp256k1 curve and store it on disk. + +Default output dir = . +Default key naming = teos_sk.der and teos_pk.der + +The output dir and naming can be changed using the -n and -d command line options, respectively. + +DISCLAIMER: Use this for testing only, using keys generated from this file in production is highly unadvised. +""" def save_sk(sk, filename): @@ -30,7 +38,7 @@ def save_pk(pk, filename): if __name__ == "__main__": name = "teos" - output_dir = "." + output_dir = "apps" opts, _ = getopt(argv[1:], "n:d:", ["name", "dir"]) for opt, arg in opts: diff --git a/test/apps/cli/__init__.py b/test/apps/cli/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/test/apps/cli/unit/__init__.py b/test/apps/cli/unit/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/apps/__init__.py b/test/cli/__init__.py similarity index 100% rename from apps/__init__.py rename to test/cli/__init__.py diff --git a/test/apps/__init__.py b/test/cli/unit/__init__.py similarity index 100% rename from test/apps/__init__.py rename to test/cli/unit/__init__.py diff --git a/test/apps/cli/unit/conftest.py b/test/cli/unit/conftest.py similarity index 100% rename from test/apps/cli/unit/conftest.py rename to test/cli/unit/conftest.py diff --git a/test/apps/cli/unit/test_teos_cli.py b/test/cli/unit/test_teos_cli.py similarity index 98% rename from test/apps/cli/unit/test_teos_cli.py rename to test/cli/unit/test_teos_cli.py index 00c9c9d..850a99f 100644 --- a/test/apps/cli/unit/test_teos_cli.py +++ b/test/cli/unit/test_teos_cli.py @@ -11,8 +11,8 @@ from common.appointment import Appointment from common.cryptographer import Cryptographer from common.blob import Blob -import apps.cli.teos_cli as teos_cli -from test.apps.cli.unit.conftest import get_random_value_hex +import cli.teos_cli as teos_cli +from test.cli.unit.conftest import get_random_value_hex common.cryptographer.logger = Logger(actor="Cryptographer", log_name_prefix=teos_cli.LOG_PREFIX) diff --git a/test/teos/e2e/test_basic_e2e.py b/test/teos/e2e/test_basic_e2e.py index ed6fab4..c87090a 100644 --- a/test/teos/e2e/test_basic_e2e.py +++ b/test/teos/e2e/test_basic_e2e.py @@ -5,7 +5,7 @@ from riemann.tx import Tx from teos import HOST, PORT -from apps.cli import teos_cli +from cli import teos_cli from common.blob import Blob import common.cryptographer @@ -21,7 +21,7 @@ from test.teos.e2e.conftest import ( create_penalty_tx, run_teosd, ) -from apps.cli import config as cli_conf +from cli import config as cli_conf common.cryptographer.logger = Logger(actor="Cryptographer", log_name_prefix="")