diff --git a/silkaj/cert.py b/silkaj/cert.py index d282cc4b5115950e2a25c27adfc3d6bc6810a4be..4aed20f978bc59f836c4f20750aee15b680dca16 100644 --- a/silkaj/cert.py +++ b/silkaj/cert.py @@ -30,7 +30,7 @@ from silkaj.auth import auth_method from silkaj.blockchain_tools import get_blockchain_parameters, get_head_block from silkaj.constants import ALL, DATE from silkaj.crypto_tools import is_pubkey_and_check -from silkaj.license import license_approval +from silkaj.g1_monetary_license import license_approval from silkaj.network_tools import client_instance, send_document diff --git a/silkaj/cli.py b/silkaj/cli.py index d8203875d7a65b3d8d668a17ceb831e5393a5df0..9ec4bac6ee09659f242de0780a8bfdcb91d2cc90 100644 --- a/silkaj/cli.py +++ b/silkaj/cli.py @@ -29,7 +29,7 @@ from silkaj.constants import ( G1_TEST_DEFAULT_ENDPOINT, SILKAJ_VERSION, ) -from silkaj.license import license_command +from silkaj.g1_monetary_license import license_command from silkaj.membership import send_membership from silkaj.money import cmd_amount from silkaj.tx import send_transaction diff --git a/silkaj/license.py b/silkaj/g1_monetary_license.py similarity index 99% rename from silkaj/license.py rename to silkaj/g1_monetary_license.py index 323e45cbe9e295d8521d11072a77a1a689015b4b..b89ce1e1b23ee0a6d4cb4c8217c19fcec55c190e 100644 --- a/silkaj/license.py +++ b/silkaj/g1_monetary_license.py @@ -16,6 +16,7 @@ from pathlib import Path import click + import g1_monetary_license as gml diff --git a/silkaj/membership.py b/silkaj/membership.py index 137f1d687e55ad4e637e5cb4add0b880255b38fc..a26e20a88ccd40c9ae5a87ef506552cfe0a98ac3 100644 --- a/silkaj/membership.py +++ b/silkaj/membership.py @@ -26,7 +26,7 @@ from tabulate import tabulate from silkaj import auth, tui, wot from silkaj.blockchain_tools import get_blockchain_parameters, get_head_block from silkaj.constants import DATE, SUCCESS_EXIT_STATUS -from silkaj.license import license_approval +from silkaj.g1_monetary_license import license_approval from silkaj.network_tools import client_instance, send_document diff --git a/tests/test_license.py b/tests/test_g1_monetary_license.py similarity index 90% rename from tests/test_license.py rename to tests/test_g1_monetary_license.py index e7637e8c01ffd5407fedc446c0e14bb562f68bdb..33ebf57ae87dd8ed8ea37c3563cdbb1c7336f433 100644 --- a/tests/test_license.py +++ b/tests/test_g1_monetary_license.py @@ -18,12 +18,13 @@ from unittest.mock import patch import pytest from click.testing import CliRunner -from silkaj import cli, license +from silkaj import cli +from silkaj import g1_monetary_license as gml from silkaj.constants import SUCCESS_EXIT_STATUS def test_license_approval_g1_test(capsys): - license.license_approval("g1-test") + gml.license_approval("g1-test") assert not capsys.readouterr().out @@ -38,11 +39,11 @@ def test_license_approval_g1_test(capsys): ], ) @patch("click.confirm") -@patch.object(license.G1MonetaryLicense, "display_license") +@patch.object(gml.G1MonetaryLicense, "display_license") def test_license_approval_g1(mock_display_license, mock_confirm, display, approve): # https://stackoverflow.com/a/62939130 mock_confirm.return_value = display - license.license_approval("g1") + gml.license_approval("g1") if display: mock_display_license.assert_called_once() mock_confirm.assert_called() @@ -65,7 +66,7 @@ def test_language_prompt(language, license_sample): def test_available_languages_and_get_license_path(): - g1ml = license.G1MonetaryLicense() + g1ml = gml.G1MonetaryLicense() for language_code in g1ml.languages_codes: assert g1ml.get_license_path(language_code).is_file() @@ -73,7 +74,7 @@ def test_available_languages_and_get_license_path(): def test_long_language_code_handling(): language_code = "fr-FR" content = "Licence monétaire Ğ1" - g1ml = license.G1MonetaryLicense() + g1ml = gml.G1MonetaryLicense() license_path = g1ml.get_license_path(language_code) runner = CliRunner() with runner.isolated_filesystem():