Update node module for v3. Comment out v2 code

Author: freQniK

src/sentinel_sdk/modules/node.py

@@ -10,9 +10,9 @@
 import hashlib
 import ecdsa
 import grpc
-import sentinel_protobuf.sentinel.node.v2.node_pb2 as node_pb2
-import sentinel_protobuf.sentinel.node.v2.querier_pb2 as sentinel_node_v2_querier_pb2
-import sentinel_protobuf.sentinel.node.v2.querier_pb2_grpc as sentinel_node_v2_querier_pb2_grpc
+import sentinel_protobuf.sentinel.node.v3.node_pb2 as node_pb2
+import sentinel_protobuf.sentinel.node.v3.querier_pb2 as sentinel_node_v3_querier_pb2
+import sentinel_protobuf.sentinel.node.v3.querier_pb2_grpc as sentinel_node_v3_querier_pb2_grpc
 import sentinel_protobuf.sentinel.node.v2.msg_pb2 as msg_pb2
 import sentinel_protobuf.sentinel.node.v3.msg_pb2 as msg_pb2_3
 
@@ -26,7 +26,7 @@
 class NodeModule(Querier, Transactor):
     def __init__(self, channel: grpc.Channel, node_timeout: int, account, client):
         self.node_timeout = node_timeout
-        self.__stub = sentinel_node_v2_querier_pb2_grpc.QueryServiceStub(channel)
+        self.__stub = sentinel_node_v3_querier_pb2_grpc.QueryServiceStub(channel)
 
         # Disable SSL verification
         self.__ssl_ctx = ssl.create_default_context()
@@ -39,26 +39,26 @@ def __init__(self, channel: grpc.Channel, node_timeout: int, account, client):
         self.__nodes_status_cache = {}
 
     def QueryParams(self) -> Any:
-        return self.__stub.QueryParams(sentinel_node_v2_querier_pb2.QueryParamsRequest()).params
+        return self.__stub.QueryParams(sentinel_node_v3_querier_pb2.QueryParamsRequest()).params
 
     def QueryNode(self, address: str) -> Any:
         r = self.__stub.QueryNode(
-            sentinel_node_v2_querier_pb2.QueryNodeRequest(address=address)
+            sentinel_node_v3_querier_pb2.QueryNodeRequest(address=address)
         )
         return r.node
 
     def QueryNodes(self, status: int, pagination: PageRequest = None) -> list:
         return self.QueryAll(
             query=self.__stub.QueryNodes,
-            request=sentinel_node_v2_querier_pb2.QueryNodesRequest,
+            request=sentinel_node_v3_querier_pb2.QueryNodesRequest,
             attribute="nodes",
             status=status.value,
             pagination=pagination,
         )
 
     def QueryNumOfNodesWithStatus(self, status: int) -> int:
         r = self.__stub.QueryNodes(
-            sentinel_node_v2_querier_pb2.QueryNodesRequest(status=status.value)
+            sentinel_node_v3_querier_pb2.QueryNodesRequest(status=status.value)
         )
         return r.pagination.total
 
@@ -104,7 +104,7 @@ def QueryNodesForPlan(
     ) -> list:
         return self.QueryAll(
             query=self.__stub.QueryNodesForPlan,
-            request=sentinel_node_v2_querier_pb2.QueryNodesForPlanRequest,
+            request=sentinel_node_v3_querier_pb2.QueryNodesForPlanRequest,
             attribute="nodes",
             status=status.value,
             id=plan_id,

src/sentinel_sdk/modules/plan.py

@@ -66,14 +66,16 @@ def LinkNode(self, plan_id: int, node_address: str, tx_params: TxParams = TxPara
             node_address = node_address,
         )
         return self.transaction([msg], tx_params)
-
+    
+    '''
     def Subscribe(self, denom: str, plan_id: int, tx_params: TxParams = TxParams()):
         msg = msg_pb2.MsgSubscribeRequest(
             frm = self._account.address,
             id = plan_id,
             denom = denom,
         )
         return self.transaction([msg], tx_params)
+    '''
 
     def UnlinkNode(self, plan_id: int, node_address: str, tx_params: TxParams = TxParams()):
         msg = msg_pb2_3.MsgUnlinkNodeRequest(

src/sentinel_sdk/modules/subscription.py

@@ -152,7 +152,9 @@ def QuerySubscriptionsForPlan(
             self.__ConvertAnyToPlanSubscription(subscription.value)
             for subscription in subscriptions
         ]
-
+        
+    # not in use anymore
+    '''
     def Allocate(self, address: str, bytes: str, id: int, tx_params: TxParams = TxParams()):
         msg = msg_pb2.MsgAllocateRequest(
             frm = self._account.address,
@@ -162,7 +164,7 @@ def Allocate(self, address: str, bytes: str, id: int, tx_params: TxParams = TxPa
         )
         return self.transaction([msg], tx_params)
 
-    '''
+    
     def Cancel(self, id: int, tx_params: TxParams = TxParams()):
         msg = msg_pb2.MsgCancelRequest(
             frm = self._account.address,
@@ -171,19 +173,19 @@ def Cancel(self, id: int, tx_params: TxParams = TxParams()):
         return self.transaction([msg], tx_params)
     '''
 
+    # id is subscription id
     def Cancel(self, id: int, tx_params: TxParams = TxParams()):
         msg = msg_pb2_3.MsgCancelSubscriptionRequest(
             frm = self._account.address,
             id = id,
         )
         return self.transaction([msg], tx_params)
 
-    # Used for plan subs        
-    def StartSession(self, address: str, subscription_id: int, tx_params: TxParams = TxParams()):
-        msg = msg_pb2_3.MsgStartSessionRequest(
+    def RenewSubscription(self, subscription_id: int, denom: str, tx_params: TxParams = TxParams()):
+        msg = msg_pb2_3.MsgRenewSubscriptionRequest(
             frm = self._account.address,
             id = subscription_id,
-            node_address = address
+            denom = denom,
         )
         return self.transaction([msg], tx_params)
 
@@ -196,16 +198,7 @@ def ShareSubscription(self, subscription_id: int, wallet_address: str, bytes: st
         )
         return self.transaction([msg], tx_params)
 
-    def RenewSubscription(self, subscription_id: int, denom: str, tx_params: TxParams = TxParams()):
-        msg = msg_pb2_3.MsgRenewSubscriptionRequest(
-            frm = self._account.address,
-            id = subscription_id,
-            denom = denom,
-        )
-        return self.transaction([msg], tx_params)
-    
     # id is plan_id 
-    
     def StartSubscription(self, plan_id: int, denom: str, renewal: int = RenewalPricePolicy.RENEWAL_PRICE_POLICY_IF_LESSER_OR_EQUAL, tx_params: TxParams = TxParams()):
         msg = msg_pb2_3.MsgStartSubscriptionRequest(
             frm = self._account.address,
@@ -222,6 +215,16 @@ def UpdateSubscription(self, subscription_id: int,  renewal: int = RenewalPriceP
             renewal_price_policy = renewal,
         )
         return self.transaction([msg], tx_params)
+    
+    # Used for plan subs        
+    def StartSession(self, address: str, subscription_id: int, tx_params: TxParams = TxParams()):
+        msg = msg_pb2_3.MsgStartSessionRequest(
+            frm = self._account.address,
+            id = subscription_id,
+            node_address = address
+        )
+        return self.transaction([msg], tx_params)
+    
     # Node subscriptions are returned by grpc querier in google's 'Any' type and need to be converted into desired protobuf type
     #
     #