From b0935caab85254e74f179ea4610a139447999b53 Mon Sep 17 00:00:00 2001 From: PhilipWafula Date: Mon, 18 Oct 2021 06:52:28 +0300 Subject: [PATCH 1/2] Fixes imports. --- apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_tasker.py | 4 ++-- .../cic_ussd/runnable/daemons/cic_user_ussd_server.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_tasker.py b/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_tasker.py index c689d02e..81856585 100644 --- a/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_tasker.py +++ b/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_tasker.py @@ -10,14 +10,14 @@ import i18n import redis from chainlib.chain import ChainSpec from confini import Config +from cic_types.ext.metadata import Metadata +from cic_types.ext.metadata.signer import Signer # local imports from cic_ussd.account.chain import Chain from cic_ussd.cache import Cache from cic_ussd.db import dsn_from_config from cic_ussd.db.models.base import SessionBase -from cic_ussd.metadata.signer import Signer -from cic_ussd.metadata.base import Metadata from cic_ussd.phone_number import Support from cic_ussd.session.ussd_session import UssdSession as InMemoryUssdSession from cic_ussd.validator import validate_presence diff --git a/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py b/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py index 2037c27a..0bbf67db 100644 --- a/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py +++ b/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py @@ -12,6 +12,7 @@ import i18n import redis from chainlib.chain import ChainSpec from confini import Config +from cic_types.ext.metadata import Metadata from cic_types.ext.metadata.signer import Signer # local imports @@ -26,7 +27,6 @@ from cic_ussd.files.local_files import create_local_file_data_stores, json_file_ from cic_ussd.http.requests import get_request_endpoint, get_request_method from cic_ussd.http.responses import with_content_headers from cic_ussd.menu.ussd_menu import UssdMenu -#from cic_ussd.metadata.base import Metadata from cic_ussd.phone_number import process_phone_number, Support, E164Format from cic_ussd.processor.ussd import handle_menu_operations from cic_ussd.runnable.server_base import exportable_parser, logg From 930a99c97405b6934de38a475a95a2967c21c638 Mon Sep 17 00:00:00 2001 From: PhilipWafula Date: Mon, 18 Oct 2021 06:52:49 +0300 Subject: [PATCH 2/2] Bumps cic-types version. --- apps/cic-ussd/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/cic-ussd/requirements.txt b/apps/cic-ussd/requirements.txt index 512ec24d..18576999 100644 --- a/apps/cic-ussd/requirements.txt +++ b/apps/cic-ussd/requirements.txt @@ -6,7 +6,7 @@ celery==4.4.7 cffi==1.14.6 cic-eth[services]~=0.12.4a11 cic-notify~=0.4.0a10 -cic-types~=0.2.0a3 +cic-types~=0.2.0a4 confini>=0.3.6rc4,<0.5.0 phonenumbers==8.12.12 psycopg2==2.8.6