From b4c505048d1478af922f9b1488d43ce308321f5b Mon Sep 17 00:00:00 2001 From: "Nick V. Anokhin" Date: Fri, 10 Jul 2026 23:31:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BB=D0=B0=D1=81=D1=81=20Crypto=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=20=D0=B2=20CryptoManager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- net/xeaf/rack/managers/__init__.py | 1 + .../crypto.py => managers/crypto_manager.py} | 2 +- net/xeaf/rack/tests/managers/__init__.py | 2 +- .../crypto_manager_tests.py} | 44 +++++++++---------- net/xeaf/rack/tests/utils/__init__.py | 1 - net/xeaf/rack/utils/__init__.py | 1 - 6 files changed, 25 insertions(+), 26 deletions(-) rename net/xeaf/rack/{utils/crypto.py => managers/crypto_manager.py} (99%) rename net/xeaf/rack/tests/{utils/crypto_tests.py => managers/crypto_manager_tests.py} (65%) diff --git a/net/xeaf/rack/managers/__init__.py b/net/xeaf/rack/managers/__init__.py index 9c3c640..3d4c502 100644 --- a/net/xeaf/rack/managers/__init__.py +++ b/net/xeaf/rack/managers/__init__.py @@ -8,4 +8,5 @@ Пакет классов менеджеров """ +from .crypto_manager import CryptoManager from .locale_manager import LocaleManager diff --git a/net/xeaf/rack/utils/crypto.py b/net/xeaf/rack/managers/crypto_manager.py similarity index 99% rename from net/xeaf/rack/utils/crypto.py rename to net/xeaf/rack/managers/crypto_manager.py index fe62ca5..b31f472 100644 --- a/net/xeaf/rack/utils/crypto.py +++ b/net/xeaf/rack/managers/crypto_manager.py @@ -11,7 +11,7 @@ import secrets -class Crypto: +class CryptoManager: """ Реализует методы работы со случайными и криптографическими значениями """ diff --git a/net/xeaf/rack/tests/managers/__init__.py b/net/xeaf/rack/tests/managers/__init__.py index aad975b..d770c19 100644 --- a/net/xeaf/rack/tests/managers/__init__.py +++ b/net/xeaf/rack/tests/managers/__init__.py @@ -8,5 +8,5 @@ Пакет описания тестов для классов менеджеров """ +from .crypto_manager_tests import CryptoManagerTests from .locale_manager_tests import LocaleManagerTests - diff --git a/net/xeaf/rack/tests/utils/crypto_tests.py b/net/xeaf/rack/tests/managers/crypto_manager_tests.py similarity index 65% rename from net/xeaf/rack/tests/utils/crypto_tests.py rename to net/xeaf/rack/tests/managers/crypto_manager_tests.py index 22d3e45..beb50c6 100644 --- a/net/xeaf/rack/tests/utils/crypto_tests.py +++ b/net/xeaf/rack/tests/managers/crypto_manager_tests.py @@ -9,10 +9,10 @@ """ from net.xeaf.rack.core import CoreTestCase -from net.xeaf.rack.utils import Crypto +from net.xeaf.rack.managers import CryptoManager -class CryptoTests(CoreTestCase): +class CryptoManagerTests(CoreTestCase): """ Тесты для класса Crypto """ @@ -22,8 +22,8 @@ class CryptoTests(CoreTestCase): Тест генерации токена """ - token = Crypto.gen_token() - self.assertEqual(len(token), Crypto.DEFAULT_TOKEN_LENGTH) + token = CryptoManager.gen_token() + self.assertEqual(len(token), CryptoManager.DEFAULT_TOKEN_LENGTH) self.assertLowerHex(token) def test_gen_token_length(self): @@ -31,7 +31,7 @@ class CryptoTests(CoreTestCase): Тест генерации токена с указанием длины """ - token = Crypto.gen_token(length=15) + token = CryptoManager.gen_token(length=15) self.assertEqual(len(token), 15) def test_gen_token_different(self): @@ -39,8 +39,8 @@ class CryptoTests(CoreTestCase): Тест генерации разных токенов """ - token1 = Crypto.gen_token() - token2 = Crypto.gen_token() + token1 = CryptoManager.gen_token() + token2 = CryptoManager.gen_token() self.assertNotEqual(token1, token2) def test_gen_pin_code(self): @@ -48,18 +48,18 @@ class CryptoTests(CoreTestCase): Тест генерации PIN-кода """ - pin_code = Crypto.gen_pin_code() - self.assertEqual(len(pin_code), Crypto.DEFAULT_PIN_CODE_LENGTH) - self.assertTrue(all(c in Crypto.DEFAULT_PIN_CODE_ALPHABET for c in pin_code)) + pin_code = CryptoManager.gen_pin_code() + self.assertEqual(len(pin_code), CryptoManager.DEFAULT_PIN_CODE_LENGTH) + self.assertTrue(all(c in CryptoManager.DEFAULT_PIN_CODE_ALPHABET for c in pin_code)) def test_gen_pin_code_length(self): """ Тест генерации PIN-кода с указанием длины """ - pin_code = Crypto.gen_pin_code(length=8) + pin_code = CryptoManager.gen_pin_code(length=8) self.assertEqual(len(pin_code), 8) - self.assertTrue(all(c in Crypto.DEFAULT_PIN_CODE_ALPHABET for c in pin_code)) + self.assertTrue(all(c in CryptoManager.DEFAULT_PIN_CODE_ALPHABET for c in pin_code)) def test_gen_pin_code_alphabet(self): """ @@ -67,8 +67,8 @@ class CryptoTests(CoreTestCase): """ letters = 'ABCD' - pin_code = Crypto.gen_pin_code(alphabet=letters) - self.assertEqual(len(pin_code), Crypto.DEFAULT_PIN_CODE_LENGTH) + pin_code = CryptoManager.gen_pin_code(alphabet=letters) + self.assertEqual(len(pin_code), CryptoManager.DEFAULT_PIN_CODE_LENGTH) self.assertTrue(all(c in letters for c in pin_code)) def test_gen_pin_code_different(self): @@ -76,8 +76,8 @@ class CryptoTests(CoreTestCase): Тест генерации разных PIN-кодов """ - pin_code_1 = Crypto.gen_pin_code() - pin_code_2 = Crypto.gen_pin_code() + pin_code_1 = CryptoManager.gen_pin_code() + pin_code_2 = CryptoManager.gen_pin_code() self.assertNotEqual(pin_code_1, pin_code_2) def test_gen_slug(self): @@ -86,8 +86,8 @@ class CryptoTests(CoreTestCase): """ pfx = 'test' - slug = Crypto.gen_slug(pfx) - self.assertEqual(len(slug), Crypto.DEFAULT_SLUG_LENGTH) + slug = CryptoManager.gen_slug(pfx) + self.assertEqual(len(slug), CryptoManager.DEFAULT_SLUG_LENGTH) self.assertEqual(slug[:len(pfx)], pfx) self.assertLowerHex(slug[len(pfx):]) @@ -97,7 +97,7 @@ class CryptoTests(CoreTestCase): """ pfx = 'test' - slug = Crypto.gen_slug(pfx, length=16) + slug = CryptoManager.gen_slug(pfx, length=16) self.assertEqual(len(slug), 16) def test_gen_slug_prefix(self): @@ -106,7 +106,7 @@ class CryptoTests(CoreTestCase): """ pfx = 'test_test_test' - slug = Crypto.gen_slug(pfx) + slug = CryptoManager.gen_slug(pfx) self.assertEqual(slug, pfx) def test_slug_different(self): @@ -114,6 +114,6 @@ class CryptoTests(CoreTestCase): Тест генерации разных slug """ - slug_1 = Crypto.gen_slug('test') - slug_2 = Crypto.gen_slug('test') + slug_1 = CryptoManager.gen_slug('test') + slug_2 = CryptoManager.gen_slug('test') self.assertNotEqual(slug_1, slug_2) diff --git a/net/xeaf/rack/tests/utils/__init__.py b/net/xeaf/rack/tests/utils/__init__.py index 1228f12..63e17a4 100644 --- a/net/xeaf/rack/tests/utils/__init__.py +++ b/net/xeaf/rack/tests/utils/__init__.py @@ -8,4 +8,3 @@ Пакет описания тестов для служебных классов и утилит """ -from .crypto_tests import CryptoTests \ No newline at end of file diff --git a/net/xeaf/rack/utils/__init__.py b/net/xeaf/rack/utils/__init__.py index 6dfa226..65eaded 100644 --- a/net/xeaf/rack/utils/__init__.py +++ b/net/xeaf/rack/utils/__init__.py @@ -8,4 +8,3 @@ Пакет служебных классов и функций """ -from .crypto import Crypto