[api] don't use static variables to allow usage of library against mu…

…ltiple chains simultanously

grapheneapi/grapheneclient.py

@@ -1,6 +1,5 @@
 from .grapheneapi import GrapheneAPI
 from .graphenews import GrapheneWebsocket
-from collections import OrderedDict
 
 import logging
 log = logging.getLogger(__name__)
@@ -315,24 +314,25 @@ class GrapheneClient() :
             graphene.run()
 
     """
-    wallet_host = None
-    wallet_port = None
-    wallet_user = None
-    wallet_password = None
-    witness_url = None
-    witness_user = None
-    witness_password = None
-    prefix = None
+    def __init__(self, config):
 
-    #: RPC connection to the cli-wallet
-    rpc = None
+        #: Definition of usual member variables
+        self.wallet_host = None
+        self.wallet_port = None
+        self.wallet_user = None
+        self.wallet_password = None
+        self.witness_url = None
+        self.witness_user = None
+        self.witness_password = None
+        self.prefix = None
 
-    #: Websocket connection to the witness/full node
-    ws  = None
+        #: RPC connection to the cli-wallet
+        self.rpc = None
 
-    def __init__(self, config):
-        """ Initialize configuration
-        """
+        #: Websocket connection to the witness/full node
+        self.ws  = None
+
+        # Initialize configuration
         available_features = dir(config)
 
         if ("wallet_host" in available_features and

grapheneapi/graphenewsprotocol.py

@@ -20,39 +20,36 @@ class GrapheneWebsocketProtocol(WebSocketClientProtocol):
         behavior.
     """
 
-    #: loop will be used to indicate the loss of connection
-    loop = None
-
-    #: Database callbacks and IDs for object subscriptions
-    database_callbacks = {}
-    database_callbacks_ids = {}
+    def __init__(self):
+        #: loop will be used to indicate the loss of connection
+        self.loop = None
 
-    #: Accounts and callbacks for account updates
-    accounts = []
-    accounts_callback = None
+        #: Database callbacks and IDs for object subscriptions
+        self.database_callbacks = {}
+        self.database_callbacks_ids = {}
 
-    #: Markets to subscribe to
-    markets = []
+        #: Accounts and callbacks for account updates
+        self.accounts = []
+        self.accounts_callback = None
 
-    #: Assets to subscribe to
-    assets = []
+        #: Markets to subscribe to
+        self.markets = []
 
-    #: Storage of Objects to reduce latency and load
-    objectMap = None
+        #: Assets to subscribe to
+        self.assets = []
 
-    #: Event Callback registrations and fnts
-    onEventCallbacks = {}
+        #: Storage of Objects to reduce latency and load
+        self.objectMap = None
 
-    #: Registered APIs with corresponding API-IDs
-    api_ids    = {}
+        #: Event Callback registrations and fnts
+        self.onEventCallbacks = {}
 
-    #: Incremental Request ID and request storage (FIXME: request storage
-    #: is not cleaned up)
-    request_id = 0
-    requests   = {}
+        #: Registered APIs with corresponding API-IDs
+        self.api_ids    = {}
 
-    def __init__(self):
-        pass
+        #: Incremental Request ID and request storage
+        self.request_id = 0
+        self.requests   = {}
 
     def _get_request_id(self):
         self.request_id += 1