Merge pull request #83 from InjectiveLabs/bug-fix

add credentials as a parameter

Author: achilleas-kal

pyinjective/async_client.py

@@ -61,20 +61,21 @@ def __init__(
         credentials: grpc.ChannelCredentials = None,
     ):
 
-        creds = None
         # load root CA cert
         if not insecure:
             if network.env == 'testnet':
-                with open(os.path.join(os.path.dirname(__file__), 'cert/testnet.crt'), 'rb') as f:
-                    creds = grpc.ssl_channel_credentials(f.read())
+                if credentials is None:
+                    with open(os.path.join(os.path.dirname(__file__), 'cert/testnet.crt'), 'rb') as f:
+                        credentials = grpc.ssl_channel_credentials(f.read())
             if network.env == 'mainnet':
-                with open(os.path.join(os.path.dirname(__file__), 'cert/mainnet.crt'), 'rb') as f:
-                    creds = grpc.ssl_channel_credentials(f.read())
+                if credentials is None:
+                    with open(os.path.join(os.path.dirname(__file__), 'cert/mainnet.crt'), 'rb') as f:
+                        credentials = grpc.ssl_channel_credentials(f.read())
 
         # chain stubs
         self.chain_channel = (
             grpc.aio.insecure_channel(network.grpc_endpoint)
-            if insecure else grpc.aio.secure_channel(network.grpc_endpoint, creds)
+            if insecure else grpc.aio.secure_channel(network.grpc_endpoint, credentials)
         )
         self.stubCosmosTendermint = tendermint_query_grpc.ServiceStub(self.chain_channel)
         self.stubAuth = auth_query_grpc.QueryStub(self.chain_channel)
@@ -84,7 +85,7 @@ def __init__(
       # exchange stubs
         self.exchange_channel = (
             grpc.aio.insecure_channel(network.grpc_exchange_endpoint)
-            if insecure else grpc.aio.secure_channel(network.grpc_exchange_endpoint, creds)
+            if insecure else grpc.aio.secure_channel(network.grpc_exchange_endpoint, credentials)
         )
         self.stubMeta = exchange_meta_rpc_grpc.InjectiveMetaRPCStub(self.exchange_channel)
         self.stubExchangeAccount = exchange_accounts_rpc_grpc.InjectiveAccountsRPCStub(self.exchange_channel)

pyinjective/client.py

@@ -53,20 +53,21 @@ def __init__(
         insecure: bool = False,
         credentials: grpc.ChannelCredentials = None,
     ):
-        creds = None
         # load root CA cert
         if not insecure:
             if network.env == 'testnet':
-                with open(os.path.join(os.path.dirname(__file__), 'cert/testnet.crt'), 'rb') as f:
-                    creds = grpc.ssl_channel_credentials(f.read())
+                if credentials is None:
+                    with open(os.path.join(os.path.dirname(__file__), 'cert/testnet.crt'), 'rb') as f:
+                        credentials = grpc.ssl_channel_credentials(f.read())
             if network.env == 'mainnet':
-                with open(os.path.join(os.path.dirname(__file__), 'cert/mainnet.crt'), 'rb') as f:
-                    creds = grpc.ssl_channel_credentials(f.read())
+                if credentials is None:
+                    with open(os.path.join(os.path.dirname(__file__), 'cert/mainnet.crt'), 'rb') as f:
+                        credentials = grpc.ssl_channel_credentials(f.read())
 
         # chain stubs
         chain_channel = (
             grpc.insecure_channel(network.grpc_endpoint)
-            if insecure else grpc.secure_channel(network.grpc_endpoint, creds)
+            if insecure else grpc.secure_channel(network.grpc_endpoint, credentials)
         )
         self.stubCosmosTendermint = tendermint_query_grpc.ServiceStub(chain_channel)
         self.stubAuth = auth_query_grpc.QueryStub(chain_channel)
@@ -78,7 +79,7 @@ def __init__(
         # exchange stubs
         exchange_channel = (
             grpc.insecure_channel(network.grpc_exchange_endpoint)
-            if insecure else grpc.secure_channel(network.grpc_exchange_endpoint, creds)
+            if insecure else grpc.secure_channel(network.grpc_exchange_endpoint, credentials)
         )
 
         self.stubMeta = exchange_meta_rpc_grpc.InjectiveMetaRPCStub(exchange_channel)