CoinFactory dependency injection.

Author: ShlikhutkaBohdan

app.py

@@ -1,5 +1,4 @@
-
-from app_tools.logger import StdoutRedirector, stdout_redirector
+from app_tools.logger import stdout_redirector
 from scan_states.context import Context
 from ui.main_widget import MainWidget
 

aws_lambda.py

@@ -1,6 +1,6 @@
 import json
 
-from coin_factory_inject import coinFactory
+from crypto_coin_factory import CoinFactoryExtended
 
 
 def lambda_handler(event, context):
@@ -9,7 +9,7 @@ def lambda_handler(event, context):
     quantity = requestBody["quantity"]
 
     coin = blockchain.upper()
-    factory = coinFactory
+    factory = CoinFactoryExtended()
     crypto_keygen_service = factory.get_coin_service(coin)
 
     coins = crypto_keygen_service.generate_list(quantity)

coin_factory_inject.py

@@ -1,16 +1,18 @@
 import asynctkinter as at
 import pygame
+from dependency_injector.wiring import Provide
 
-from coin_factory_inject import coinFactory
+from keygen.crypto_coin_factory import CoinFactory
 from scan_states.context import Context
 from scan_states.state_factory import get_state
 from scan_states.states_enum import States
 import logging
 
 
 class CoinCheckerController(Context):
-    def __init__(self, root, window):
+    def __init__(self, root, window, coin_factory: CoinFactory = Provide['coin_factory']):
         super().__init__()
+        self.coin_factory = coin_factory
         self.logger = logging.getLogger(f'{self.__class__.__name__}', )
         self.root = root
         self.window = window
@@ -24,7 +26,7 @@ def __init__(self, root, window):
         self.snip = None
 
     def init(self):
-        currencies = coinFactory.get_available_currencies()
+        currencies = self.coin_factory.get_available_currencies()
         self.currency = currencies[0]
 
         self.select_currency(self.currency)
@@ -37,7 +39,7 @@ def on_refreshed(self):
 
     def select_currency(self, currency):
         self.currency = currency
-        self.coin_service = coinFactory.get_coin_service(self.currency)
+        self.coin_service = self.coin_factory.get_coin_service(self.currency)
         self.change_state(States.SCAN_COIN_STATE)
         self.root.set_currency(currency)
         self.logger.info("Selected currency: %s", self.currency)

controller/coin_checker_controller.py

@@ -1,8 +1,9 @@
 
 import asynctkinter as at
 import pygame
+from dependency_injector.wiring import Provide
 
-from coin_factory_inject import coinFactory
+from keygen.crypto_coin_factory import CoinFactory
 from logic.recovery import RecoveryProcessor
 from scan_states.recovery.context import Context
 from scan_states.recovery.state_factory import get_state
@@ -11,8 +12,9 @@
 
 
 class RecoveryController(Context):
-    def __init__(self, root, window):
+    def __init__(self, root, window, coin_factory: CoinFactory = Provide['coin_factory']):
         super().__init__()
+        self.coin_factory = coin_factory
         self.logger = logging.getLogger(f'{self.__class__.__name__}', )
         self.recovery_processor = RecoveryProcessor()
 
@@ -32,7 +34,7 @@ def __init__(self, root, window):
         self.coins = []
 
     def init(self):
-        currencies = coinFactory.get_available_currencies()
+        currencies = self.coin_factory.get_available_currencies()
         self.currency = currencies[0]
 
         self.select_currency(self.currency)
@@ -53,7 +55,7 @@ def on_qr_code_scanned(self, qr_code_text):
 
     def select_currency(self, currency):
         self.currency = currency
-        self.coin_service = coinFactory.get_coin_service(self.currency)
+        self.coin_service = self.coin_factory.get_coin_service(self.currency)
         self.change_state(States.SCAN_COIN_STATE)
         self.root.set_currency(currency)
         self.logger.info("Selected currency: %s", self.currency)

controller/recovery_controller.py

@@ -1,13 +1,11 @@
-import tkinter
-
 import sys
-
-from app import App
+import tkinter
 import pygame
-
+from app import App
 from app_tools.logger import stdout_redirector
 from di.containers import MyContainer
 import ui
+import controller
 
 
 def main():
@@ -22,5 +20,5 @@ def main():
     container = MyContainer()
     container.init_resources()
     container.config.from_ini('config.ini')
-    container.wire(modules=[sys.modules[__name__]], packages=[ui])
+    container.wire(modules=[sys.modules[__name__]], packages=[ui, controller])
     main()

csc-manager.py

@@ -3,8 +3,8 @@
 import logging.config
 
 from dependency_injector import containers, providers
-
 from app_tools.my_video_capture import MyVideoCapture
+from crypto_coin_factory import CoinFactoryExtended
 
 
 class MyContainer(containers.DeclarativeContainer):
@@ -18,4 +18,5 @@ class MyContainer(containers.DeclarativeContainer):
 
     default_video_capture = providers.Singleton(MyVideoCapture)
 
+    coin_factory = providers.Singleton(CoinFactoryExtended)
 

di/containers.py

@@ -1,13 +1,17 @@
-from coin_factory_inject import coinFactory
 import json
 
 import logging
 
+from dependency_injector.wiring import Provide
+
+from keygen.crypto_coin_factory import CoinFactory
+
 
 class KeygenProcessor:
 
-    def __init__(self):
+    def __init__(self, coin_factory: CoinFactory = Provide['coin_factory']):
         super().__init__()
+        self.coin_factory = coin_factory
         self.logger = logging.getLogger(f'{self.__class__.__name__}', )
 
     def generate_keys(self, count, coin, laser):
@@ -22,8 +26,7 @@ def generate_keys(self, count, coin, laser):
         max_iterator_count = int(count)
 
         try:
-            factory = coinFactory
-            crypto_keygen_service = factory.get_coin_service(coin)
+            crypto_keygen_service = self.coin_factory.get_coin_service(coin)
 
             if max_iterator_count > 0:
                 coin_list = crypto_keygen_service.generate_list(max_iterator_count)

logic/keygen.py

@@ -1,8 +1,8 @@
-from coin_factory_inject import coinFactory
+from crypto_coin_factory import CoinFactoryExtended
 
 
 def test_coin(currency, private_key, address):
-    service = coinFactory.get_coin_service(currency)
+    service = CoinFactoryExtended().get_coin_service(currency)
     gen_address = service.get_address(private_key)
     assert gen_address == address
 

test/test-coins-1.py

@@ -1,8 +1,8 @@
-from coin_factory_inject import coinFactory
+from crypto_coin_factory import CoinFactoryExtended
 
 
 def test_coin(currency, private_key, address):
-    service = coinFactory.get_coin_service(currency)
+    service = CoinFactoryExtended().get_coin_service(currency)
     gen_address = service.get_address(private_key)
     assert gen_address == address
 

test/test-coins-2.py

@@ -1,9 +1,9 @@
-from coin_factory_inject import coinFactory
+from crypto_coin_factory import CoinFactoryExtended
 
 
 def test_coin():
     currency = "ETH"
-    service = coinFactory.get_coin_service(currency)
+    service = CoinFactoryExtended().get_coin_service(currency)
     coin = service.generate()
     print(currency)
     print(coin)

test/test-coins-4.py

@@ -1,21 +1,25 @@
 import tkinter
 
-from coin_factory_inject import coinFactory
+from dependency_injector.wiring import Provide
+
 from controller.coin_checker_controller import CoinCheckerController
+from keygen.crypto_coin_factory import CoinFactory
 from ui.footer_widget import FooterWidget
 from ui.header_widget import HeaderWidget
 import logging
 
 
 class CoinCheckerWidget:
-    def __init__(self, coin_checker_frame):
+    def __init__(self, coin_checker_frame,
+                 coin_factory: CoinFactory = Provide['coin_factory'], ):
+        self.coin_factory = coin_factory
         self.logger = logging.getLogger(f'{self.__class__.__name__}', )
 
         self.coin_checker_frame = coin_checker_frame
 
         top_frame = tkinter.Frame(self.coin_checker_frame, borderwidth=3)
 
-        currencies = coinFactory.get_available_currencies()
+        currencies = self.coin_factory.get_available_currencies()
         self.currencies = currencies
 
         self.coin_checker_controller = CoinCheckerController(self, coin_checker_frame)
@@ -66,5 +70,3 @@ def init_camera(self):
     def release_camera(self):
         self.logger.info("release coin_checker camera")
         self.footer_widget.camera_widget.pause()
-
-

ui/coin_checker_widget.py

@@ -2,12 +2,15 @@
 from tkinter import ttk, messagebox
 from tkinter.ttk import Progressbar
 
-from coin_factory_inject import coinFactory
+from dependency_injector.wiring import Provide
+
 from controller.keygen_controller import KeygenController
 
 import json
 import logging
 
+from keygen.crypto_coin_factory import CoinFactory
+
 
 def load_lasers():
     with open('config.json') as json_file:
@@ -18,10 +21,10 @@ def load_lasers():
 
 class KeygenWidget:
 
-    def __init__(self, root):
+    def __init__(self, root, coin_factory: CoinFactory = Provide['coin_factory']):
         self.logger = logging.getLogger(f'{self.__class__.__name__}', )
         self.root = root
-        self.currencies = coinFactory.get_available_currencies()
+        self.currencies = coin_factory.get_available_currencies()
 
         combo_frame = tkinter.Frame(root, pady=15)
         tkinter.Label(combo_frame, text="Select currency").pack()

ui/keygen_widget.py

@@ -1,7 +1,9 @@
 import tkinter
 
-from coin_factory_inject import coinFactory
+from dependency_injector.wiring import Provide
+
 from controller.recovery_controller import RecoveryController
+from keygen.crypto_coin_factory import CoinFactory
 from ui.recovery.header_widget import HeaderWidget
 from ui.recovery.footer_widget import FooterWidget
 import logging
@@ -10,13 +12,14 @@
 
 
 class RecoveryWidget:
-    def __init__(self, recovery_frame):
+    def __init__(self, recovery_frame,
+                 coin_factory: CoinFactory = Provide['coin_factory']):
         self.recovery_frame = recovery_frame
         self.logger = logging.getLogger(f'{self.__class__.__name__}', )
 
         top_frame = tkinter.Frame(self.recovery_frame, borderwidth=3)
 
-        currencies = coinFactory.get_available_currencies()
+        currencies = coin_factory.get_available_currencies()
         self.currencies = currencies
 
         self.recovery_controller = RecoveryController(self, recovery_frame)