some refactoring

Signed-off-by: lovesh harchandani <lovesh.bond@gmail.com>

.pytest_cache/v/cache/lastfailed

@@ -0,0 +1,5 @@
+{
+  "basicmessage.manual": true,
+  "connection.manual": true,
+  "trustping.manual": true
+}

.pytest_cache/v/cache/nodeids

@@ -0,0 +1 @@
+[]

python/agent.py

@@ -10,10 +10,10 @@
 import aiohttp
 from indy import wallet, did, error, crypto, pairwise
 
-import indy_sdk_utils as utils
-from message import Message
-from router.family_router import FamilyRouter
-from serializer import json_serializer as Serializer
+import python.indy_sdk_utils as utils
+from python.serializer import json_serializer as Serializer
+from python.message import Message
+from python.router.family_router import FamilyRouter
 
 
 class WalletConnectionException(Exception):

python/indy-agent.py

@@ -14,15 +14,16 @@
 import aiohttp_jinja2
 from aiohttp import web
 
-from modules.connection import Connection, AdminConnection
-from modules.admin import Admin, root
-from modules.admin_walletconnection import AdminWalletConnection
-from modules.basicmessage import AdminBasicMessage, BasicMessage
-from modules.trustping import AdminTrustPing, TrustPing
-from post_message_handler import PostMessageHandler
-from websocket_message_handler import WebSocketMessageHandler
-from agent import Agent
-from message import Message
+from python.modules.connection import Connection, AdminConnection
+from python.modules.admin import Admin, root
+from python.modules.admin_walletconnection import AdminWalletConnection
+from python.modules.basicmessage import AdminBasicMessage, BasicMessage
+from python.modules.trustping import AdminTrustPing, TrustPing
+from python.post_message_handler import PostMessageHandler
+from python.websocket_message_handler import WebSocketMessageHandler
+from python.agent import Agent
+from python.message import Message
+
 
 if __name__ == "__main__":
 

python/indy_sdk_utils.py

@@ -3,6 +3,7 @@
 import json
 from indy import did, crypto, non_secrets, error
 
+
 async def create_and_store_my_did(wallet_handle):
     """ Create and store my DID, adding a map from verkey to DID using the
         non_secrets API.
@@ -17,7 +18,8 @@ async def create_and_store_my_did(wallet_handle):
         '{}'
     )
 
-    return (my_did, my_vk)
+    return my_did, my_vk
+
 
 async def store_their_did(wallet_handle, their_did, their_vk):
     """ Store their did, adding a map from verkey to DID using the non_secrets

python/message.py

@@ -25,7 +25,6 @@ def __init__(self, *args, **kwargs):
         if '@id' not in self.data:
             self.data['@id'] = str(uuid.uuid4())
 
-
     def to_dict(self):
         return self.data
 

python/modules/__init__.py

@@ -1,2 +1,2 @@
-class Module():
+class Module:
     pass

python/modules/admin.py

@@ -3,13 +3,14 @@
 import json
 import socket
 from indy import did, wallet, non_secrets, pairwise
-from indy_sdk_utils import get_wallet_records
+from python.indy_sdk_utils import get_wallet_records
 
-from router.simple_router import SimpleRouter
-from agent import Agent
-from message import Message
+from python.router.simple_router import SimpleRouter
+from python.agent import Agent
+from python.message import Message
 from . import Module
 
+
 class Admin(Module):
     FAMILY_NAME = "admin"
     VERSION = "1.0"

python/modules/admin_walletconnection.py

@@ -3,12 +3,13 @@
 import json
 from indy import did, wallet
 
-from router.simple_router import SimpleRouter
-from agent import Agent, WalletConnectionException
-from modules.admin import Admin
-from message import Message
+from python.router.simple_router import SimpleRouter
+from python.agent import Agent, WalletConnectionException
+from python.modules.admin import Admin
+from python.message import Message
 from . import Module
 
+
 class AdminWalletConnection(Module):
     FAMILY_NAME = "admin_walletconnection"
     VERSION = "1.0"
@@ -18,7 +19,6 @@ class AdminWalletConnection(Module):
     DISCONNECT = FAMILY + "disconnect"
     USER_ERROR = FAMILY + "user_error"
 
-
     def __init__(self, agent):
         self.agent = agent
         self.router = SimpleRouter()

python/modules/basicmessage.py

@@ -8,13 +8,14 @@
 import uuid
 from indy import did, wallet, pairwise, crypto, non_secrets
 
-from helpers import str_to_bytes, serialize_bytes_json, bytes_to_str
-from router.simple_router import SimpleRouter
-import serializer.json_serializer as Serializer
-from agent import Agent, WalletConnectionException
-from message import Message
+from python.helpers import str_to_bytes, serialize_bytes_json, bytes_to_str
+from python.router.simple_router import SimpleRouter
+import python.serializer.json_serializer as Serializer
+from python.agent import Agent, WalletConnectionException
+from python.message import Message
 from . import Module
 
+
 class AdminBasicMessage(Module):
     FAMILY_NAME = "admin_basicmessage"
     VERSION = "1.0"

python/modules/connection.py

@@ -12,17 +12,19 @@
 import aiohttp
 from indy import crypto, did, pairwise, non_secrets, error
 
-import indy_sdk_utils as utils
-import serializer.json_serializer as Serializer
-from router.simple_router import SimpleRouter
+import python.indy_sdk_utils as utils
+import python.serializer.json_serializer as Serializer
+from python.router.simple_router import SimpleRouter
 from . import Module
-from message import Message
-from helpers import serialize_bytes_json, bytes_to_str, str_to_bytes
+from python.message import Message
+from python.helpers import serialize_bytes_json, bytes_to_str, str_to_bytes
+
 
 class BadInviteException(Exception):
     def __init__(self, msg):
         super().__init__(msg)
 
+
 class AdminConnection(Module):
     FAMILY_NAME = "admin_connections"
     VERSION = "1.0"
@@ -352,6 +354,7 @@ async def send_response(self, msg: Message) -> Message:
                                                'invitations',
                                                pairwise_meta['connection_key'])
 
+
 class Connection(Module):
 
     FAMILY_NAME = "connections"
@@ -362,7 +365,6 @@ class Connection(Module):
     REQUEST = FAMILY + "request"
     RESPONSE = FAMILY + "response"
 
-
     def __init__(self, agent):
         self.agent = agent
         self.router = SimpleRouter()
@@ -466,9 +468,6 @@ async def request_received(self, msg: Message) -> Message:
             raise indy_error
         await self.agent.send_admin_message(pending_connection)
 
-
-
-
     async def response_received(self, msg: Message) -> Message:
         """ Process response
 

python/modules/trustping.py

@@ -7,13 +7,14 @@
 import uuid
 from indy import did, wallet, pairwise, crypto, non_secrets
 
-from helpers import str_to_bytes, serialize_bytes_json, bytes_to_str
-from router.simple_router import SimpleRouter
-import serializer.json_serializer as Serializer
-from agent import Agent, WalletConnectionException
-from message import Message
+from python.helpers import str_to_bytes, serialize_bytes_json, bytes_to_str
+from python.router.simple_router import SimpleRouter
+import python.serializer.json_serializer as Serializer
+from python.agent import Agent, WalletConnectionException
+from python.message import Message
 from . import Module
 
+
 class AdminTrustPing(Module):
     FAMILY_NAME = "admin_trustping"
     VERSION = "1.0"

python/post_message_handler.py

@@ -4,6 +4,7 @@
 from aiohttp import web
 import asyncio
 
+
 class PostMessageHandler():
     """ Simple message queue interface for receiving messages.
     """

python/router/__init__.py

@@ -3,9 +3,10 @@
 """
 
 from typing import Callable
-from message import Message
+from ..message import Message
 
-class BaseRouter(object):
+
+class BaseRouter:
     """ Router Base Class. Provide basic interface for additional routers.
     """
 
@@ -27,5 +28,6 @@ class RouteAlreadyRegisteredException(Exception):
     """
     pass
 
+
 class UnparsableMessageFamilyException(Exception):
     pass

python/router/family_router.py

@@ -2,10 +2,10 @@
 """
 
 import re
-from typing import Callable
-from modules import Module
-from message import Message
-from . import BaseRouter, RouteAlreadyRegisteredException
+from python.modules import Module
+from python.message import Message
+from . import BaseRouter, RouteAlreadyRegisteredException, UnparsableMessageFamilyException
+
 
 class FamilyRouter(BaseRouter):
     """ Simple router for handling Indy Messages.
@@ -35,7 +35,7 @@ async def route(self, msg: Message):
 
     @staticmethod
     def family_from_type(msg_type: str) -> str:
-        matches = re.match("(.+/.+/\d.\d/).+", msg_type)
+        matches = re.match("(.+/.+/\d+.\d+/).+", msg_type)
         if not matches:
             raise UnparsableMessageFamilyException()
 

python/router/simple_router.py

@@ -2,9 +2,10 @@
 """
 
 from typing import Callable
-from message import Message
+from python.message import Message
 from . import BaseRouter, RouteAlreadyRegisteredException
 
+
 class SimpleRouter(BaseRouter):
     """ Simple router for handling Sovrin Messages.
 

python/serializer/__init__.py

@@ -7,7 +7,8 @@
     of serialization to another.
 """
 
-from message import Message
+from python.message import Message
+
 
 def unpack(msg: bytes) -> Message: #pylint: disable=unused-argument
     """ Deserialize to Message.
@@ -17,6 +18,7 @@ def unpack(msg: bytes) -> Message: #pylint: disable=unused-argument
         is not implemented. Use the methods contained in a submodule of \
         serializer, such as json_serializer.")
 
+
 def pack(msg: Message) -> bytes: #pylint: disable=unused-argument
     """ Serialize to bytes.
     """

python/serializer/json_serializer.py

@@ -4,7 +4,7 @@
 
 import json
 
-from message import Message
+from python.message import Message
 
 
 def unpack_dict(dictionary: dict) -> Message:

python/websocket_message_handler.py

@@ -2,7 +2,8 @@
 import aiohttp
 from aiohttp import web
 
-class WebSocketMessageHandler(object):
+
+class WebSocketMessageHandler:
     def __init__(self, inbound_queue, outbound_queue):
         self.recv_q = inbound_queue
         self.send_q = outbound_queue

test-suite/.gitignore → test_suite/.gitignore

@@ -1,3 +1,4 @@
 env
 __pycache__
 .pytest_cache
+tests/*/.testing-wallets/

test-suite/config.py → test_suite/config.py

@@ -8,13 +8,14 @@
 import os
 import sys
 
+
 class InvalidConfigurationException(Exception):
     """ Exception raise on absent required configuration value
     """
     pass
 
 
-class Config():
+class Config:
     """ Configuration class used to store and update configuration information.
     """