test: remove custom rpc request id (#6918)

Author: igor-sirotin

tests-functional/clients/rpc.py

@@ -6,30 +6,31 @@ class RpcClient(ApiClient):
 
     def __init__(self, client=requests.Session()):
         self.client = client
-        self.request_counter = 0
+        self._request_id = 0
 
-    def validate_json_rpc_response(self, response, _id=None):
+    @property
+    def request_id(self) -> int:
+        self._request_id += 1
+        return self._request_id
+
+    def validate_json_rpc_response(self, response, _id):
         # Must contain exactly one of 'result' or 'error'
         has_result = "result" in response
         has_error = "error" in response
 
         if not (has_result ^ has_error):  # True only if exactly one is True
             raise AssertionError(f"Invalid structure: must contain exactly one of 'result' or 'error', got: {response}")
 
-        if _id:
-            try:
-                if _id != response["id"]:
-                    raise AssertionError(f"got id: {response['id']} instead of expected id: {_id}")
-            except KeyError:
-                raise AssertionError(f"no id in response {response}")
+        try:
+            if _id != response["id"]:
+                raise AssertionError(f"got id: {response['id']} instead of expected id: {_id}")
+        except KeyError:
+            raise AssertionError(f"no id in response {response}")
+
         return response
 
-    def rpc_valid_request(self, method, params=None, _id=None):
-        if not _id:
-            request_id = self.request_counter
-            self.request_counter += 1
-        else:
-            request_id = _id
+    def rpc_valid_request(self, method, params=None):
+        request_id = self.request_id
 
         if params is None:
             params = []

tests-functional/tests/test_accounts.py

@@ -1,6 +1,7 @@
 import os
-import random
+
 import pytest
+
 from resources.constants import user_1
 
 
@@ -22,8 +23,7 @@ def setup_backend(self, backend_new_profile):
         ],
     )
     def test_(self, method, params):
-        _id = str(random.randint(1, 8888))
-        self.rpc_client.rpc_valid_request(method, params, _id)
+        self.rpc_client.rpc_valid_request(method, params)
         # TODO: Add assertions on response
 
     def test_store_identity_image(self):

tests-functional/tests/test_app_general.py

@@ -1,4 +1,3 @@
-import random
 import pytest
 
 
@@ -18,7 +17,5 @@ def setup_backend(self, backend_new_profile):
         ],
     )
     def test_(self, method, params):
-        _id = str(random.randint(1, 8888))
-
-        self.rpc_client.rpc_valid_request(method, params, _id)
+        self.rpc_client.rpc_valid_request(method, params)
         # TODO: Add more assertions on response

tests-functional/tests/test_wakuext_profile.py

@@ -1,7 +1,6 @@
-import random
+import logging
 
 import pytest
-import logging
 
 from clients.signals import SignalType
 from steps.messenger import MessengerSteps
@@ -35,8 +34,7 @@ def setup_backend(self, backend_new_profile):
         ],
     )
     def test_wakuext_(self, method, params):
-        _id = str(random.randint(1, 8888))
-        self.rpc_client.rpc_valid_request(method, params, _id)
+        self.rpc_client.rpc_valid_request(method, params)
 
     @pytest.mark.parametrize(
         "method, setting_name, default_value, changed_value",
@@ -61,14 +59,12 @@ def test_wakuext_(self, method, params):
         ],
     )
     def test_settings_(self, method, setting_name, default_value, changed_value):
-        _id = str(random.randint(1, 8888))
-
         logging.info("Step: check that %s is %s by default " % (setting_name, default_value))
         response = self.rpc_client.rpc_valid_request("settings_getSettings", [])
         assert response[setting_name] == default_value
 
         logging.info("Step: change %s to %s and check it is updated" % (setting_name, changed_value))
-        self.rpc_client.rpc_valid_request(method, [setting_name, changed_value], _id)
+        self.rpc_client.rpc_valid_request(method, [setting_name, changed_value])
         response = self.rpc_client.rpc_valid_request("settings_getSettings", [])
         assert response[setting_name] == changed_value
 
@@ -95,14 +91,12 @@ def test_settings_(self, method, setting_name, default_value, changed_value):
         ],
     )
     def test_omitempty_false_(self, method, setting_name, set_value):
-        _id = str(random.randint(1, 8888))
-
         logging.info("Step: assert that %s is not retrieved in settings before setting" % (setting_name))
         response = self.rpc_client.rpc_valid_request("settings_getSettings", [])
         assert setting_name not in response
 
         logging.info("Step: change %s to %s and check it is updated" % (setting_name, set_value))
-        self.rpc_client.rpc_valid_request(method, [setting_name, set_value], _id)
+        self.rpc_client.rpc_valid_request(method, [setting_name, set_value])
         response = self.rpc_client.rpc_valid_request("settings_getSettings", [])
         assert response[setting_name] == set_value
 
@@ -121,14 +115,12 @@ def test_omitempty_false_(self, method, setting_name, set_value):
         ],
     )
     def test_omitempty_true_(self, method, setting_name, set_value):
-        _id = str(random.randint(1, 8888))
-
         logging.info("Step: assert that %s is  retrieved in settings before unsetting" % (setting_name))
         response = self.rpc_client.rpc_valid_request("settings_getSettings", [])
         assert setting_name in response
 
         logging.info("Step: change %s to %s and check it is updated and does not retrieve anymore" % (setting_name, set_value))
-        self.rpc_client.rpc_valid_request(method, [setting_name, set_value], _id)
+        self.rpc_client.rpc_valid_request(method, [setting_name, set_value])
         response = self.rpc_client.rpc_valid_request("settings_getSettings", [])
         assert setting_name not in response
 

tests-functional/tests/test_wakuext_rpc.py

@@ -1,4 +1,3 @@
-import random
 import pytest
 
 
@@ -16,7 +15,5 @@ def setup_backend(self, backend_new_profile):
         ],
     )
     def test_valid_rpc_requests(self, method, params):
-        _id = str(random.randint(1, 8888))
-
-        self.rpc_client.rpc_valid_request(method, params, _id)
+        self.rpc_client.rpc_valid_request(method, params)
         # TODO: Add more assertions on response

tests-functional/tests/test_wallet_activity_session.py

@@ -1,17 +1,21 @@
 import json
-import random
-from utils import wallet_utils
 import uuid as uuid_lib
+
 import pytest
+from web3 import Web3
 
-from resources.constants import user_1, user_2
-from clients.signals import SignalType
 from clients.anvil import Anvil
+from clients.contract_deployers.communities import CommunitiesDeployer
+from clients.contract_deployers.snt import (
+    SNTDeployer,
+    SNTV2_ABI,
+    SNT_TOKEN_CONTROLLER_ABI,
+)
+from clients.signals import SignalType
 from clients.smart_contract_runner import SmartContractRunner
-from clients.contract_deployers.snt import SNTDeployer, SNTV2_ABI, SNT_TOKEN_CONTROLLER_ABI
 from resources.constants import DEPLOYER_ACCOUNT
-from clients.contract_deployers.communities import CommunitiesDeployer
-from web3 import Web3
+from resources.constants import user_1, user_2
+from utils import wallet_utils
 
 EventActivityFilteringDone = "wallet-activity-filtering-done"
 EventActivityFilteringUpdate = "wallet-activity-filtering-entries-updated"
@@ -74,7 +78,6 @@ def setup_backend(self, backend_recovered_profile):
         # Create backend
         self.rpc_client = backend_recovered_profile(name="rpc_client", user=user_1, token_overrides=token_overrides)
 
-        self.request_id = str(random.randint(1, 8888))
         self.mint_snt(user_1.address, 1000000000000000000000000)
 
     def test_wallet_start_activity_filter_session(self):
@@ -124,7 +127,7 @@ def test_wallet_start_activity_filter_session(self):
             1,
             lambda signal: signal["event"]["type"] == EventActivityFilteringDone,
         )
-        response = self.rpc_client.rpc_valid_request(method, params, self.request_id)
+        response = self.rpc_client.rpc_valid_request(method, params)
         event_response = self.rpc_client.wait_for_signal("wallet", timeout=10)["event"]
 
         # Check response
@@ -181,7 +184,7 @@ def test_wallet_start_activity_filter_session(self):
             1,
             lambda signal: signal["event"]["type"] == EventActivityFilteringDone and signal["event"]["requestId"] == sessionID,
         )
-        response = self.rpc_client.rpc_valid_request(method, params, self.request_id)
+        response = self.rpc_client.rpc_valid_request(method, params)
         event_response = self.rpc_client.wait_for_signal("wallet", timeout=10)["event"]
 
         # Check response event

tests-functional/tests/test_wallet_rpc.py

@@ -1,5 +1,5 @@
-import random
 import pytest
+
 from resources.constants import user_1
 
 
@@ -82,7 +82,5 @@ def setup_backend(self, backend_recovered_profile):
         ],
     )
     def test_(self, method, params):
-        _id = str(random.randint(1, 8888))
-
-        self.rpc_client.rpc_valid_request(method, params, _id)
+        self.rpc_client.rpc_valid_request(method, params)
         # TODO: Add more assertions on response

tests-functional/tests/test_wallet_signals.py

@@ -1,9 +1,9 @@
 import json
-import random
+
 import pytest
 
-from resources.constants import user_1
 from clients.signals import SignalType
+from resources.constants import user_1
 
 
 @pytest.mark.wallet
@@ -13,7 +13,6 @@ class TestWalletSignals:
 
     @pytest.fixture(autouse=True)
     def setup_backend(self, backend_recovered_profile):
-        self.request_id = str(random.randint(1, 8888))
         self.rpc_client = backend_recovered_profile(name="rpc_client", user=user_1)
 
     @pytest.mark.skip  # TODO: returns empty response in most of the cases, so needs to be fixed with attention of required signals in signal_response
@@ -31,7 +30,7 @@ def test_wallet_get_owned_collectibles_async(self):
             1,
             {"fetch-type": 2, "max-cache-age-seconds": 3600},
         ]
-        self.rpc_client.rpc_valid_request(method, params, self.request_id)
+        self.rpc_client.rpc_valid_request(method, params)
         signal_response = self.rpc_client.wait_for_signal(SignalType.WALLET.value, timeout=60)
         # TODO: Add more assertions on response
         assert signal_response["event"]["type"] == "wallet-owned-collectibles-filtering-done"