diff --git a/src/api_clients/invalid_rest.py b/src/api_clients/invalid_rest.py index 8434e70..f9dcab6 100644 --- a/src/api_clients/invalid_rest.py +++ b/src/api_clients/invalid_rest.py @@ -61,12 +61,12 @@ class InvalidRest(REST): def __init__(self, rest_port): super().__init__(rest_port) - def send_dispersal_request(self, data): + def da_disperse_data(self, data): data = alter_dispersal_data(data) response = self.rest_call("post", "disperse-data", json.dumps(data)) return response - def send_get_range(self, query): + def da_get_range(self, query): query = alter_get_range_query(query) response = self.rest_call("post", "da/get-range", json.dumps(query)) return response.json() diff --git a/src/api_clients/rest.py b/src/api_clients/rest.py index 65b593f..e98fd40 100644 --- a/src/api_clients/rest.py +++ b/src/api_clients/rest.py @@ -19,14 +19,22 @@ class REST(BaseClient): headers = {"accept": "text/plain", "Connection": "close"} return self.make_request(method, url, headers=headers, data=payload) - def info(self): + def cl_metrics(self): + response = self.rest_call("get", "cl/metrics") + return response.json() + + def cl_status(self, query): + response = self.rest_call("post", "cl/status", json.dumps(query)) + return response.json() + + def cryptarchia_info(self): response = self.rest_call("get", "cryptarchia/info") return response.json() - def send_dispersal_request(self, data): + def da_disperse_data(self, data): response = self.rest_call("post", "disperse-data", json.dumps(data)) return response - def send_get_range(self, query): + def da_get_range(self, query): response = self.rest_call("post", "da/get-range", json.dumps(query)) return response.json() diff --git a/src/client/proxy_client.py b/src/client/proxy_client.py index 51aab06..8794819 100644 --- a/src/client/proxy_client.py +++ b/src/client/proxy_client.py @@ -91,12 +91,12 @@ class ProxyClient: def send_dispersal_request(self, data, send_invalid=False): if send_invalid: - return self._invalid_api.send_dispersal_request(data) + return self._invalid_api.da_disperse_data(data) - return self._api.send_dispersal_request(data) + return self._api.da_disperse_data(data) def send_get_data_range_request(self, data, send_invalid=False): if send_invalid: - return self._invalid_api.send_get_range(data) + return self._invalid_api.da_get_range(data) - return self._api.send_get_range(data) + return self._api.da_get_range(data) diff --git a/src/node/nomos_node.py b/src/node/nomos_node.py index 5bc9b88..ce894b1 100644 --- a/src/node/nomos_node.py +++ b/src/node/nomos_node.py @@ -118,7 +118,7 @@ class NomosNode: return "nomos" in self._container_name def info(self): - return self._api.info() + return self._api.cryptarchia_info() def node_type(self): return self._node_type @@ -153,7 +153,7 @@ class NomosNode: logger.debug("No keyword matches found in the logs.") def send_dispersal_request(self, data): - return self._api.send_dispersal_request(data) + return self._api.da_disperse_data(data) def send_get_data_range_request(self, data): - return self._api.send_get_range(data) + return self._api.da_get_range(data)