logos-blockchain/logos-blockchain-e2e-tests
1
0
Fork 0
mirror of https://github.com/logos-blockchain/logos-blockchain-e2e-tests.git synced 2026-01-09 00:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: simplify invalid REST API usage

Browse Source
This commit is contained in:
Roman 2025-03-12 00:12:35 +00:00
parent 9b41603bb8
commit a373193bdb
No known key found for this signature in database
GPG Key ID: BB3828275C58EFF1
3 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api_clients/rest.py
View File

@ -20,11 +20,12 @@ class REST(BaseClient):
return self.make_request(method, url, headers=headers, data=payload) return self.make_request(method, url, headers=headers, data=payload)
def info(self): def info(self):
status_response = self.rest_call("get", "cryptarchia/info") response = self.rest_call("get", "cryptarchia/info")
return status_response.json() return response.json()
def send_dispersal_request(self, data): def send_dispersal_request(self, data):
return self.rest_call("post", "disperse-data", json.dumps(data)) response = self.rest_call("post", "disperse-data", json.dumps(data))
return response
def send_get_range(self, query): def send_get_range(self, query):
response = self.rest_call("post", "da/get-range", json.dumps(query)) response = self.rest_call("post", "da/get-range", json.dumps(query))

20
src/client/proxy_client.py
View File

@ -1,6 +1,4 @@
import json
import os import os
import re
from src.api_clients.invalid_rest import InvalidRest from src.api_clients.invalid_rest import InvalidRest
from src.api_clients.rest import REST from src.api_clients.rest import REST
@ -33,6 +31,7 @@ class ProxyClient:
self._container_name = container_name self._container_name = container_name
self._container = None self._container = None
self._api = None self._api = None
self._invalid_api = None
cwd = os.getcwd() cwd = os.getcwd()
self._volumes = [cwd + "/" + volume for volume in self._volumes] self._volumes = [cwd + "/" + volume for volume in self._volumes]
@ -44,6 +43,7 @@ class ProxyClient:
self._external_ports = self._docker_manager.generate_ports(count=1) self._external_ports = self._docker_manager.generate_ports(count=1)
self._tcp_port = self._external_ports[0] self._tcp_port = self._external_ports[0]
self._api = REST(self._tcp_port) self._api = REST(self._tcp_port)
self._invalid_api = InvalidRest(self._tcp_port)
logger.debug(f"Internal ports {self._internal_ports}") logger.debug(f"Internal ports {self._internal_ports}")
@ -77,12 +77,6 @@ class ProxyClient:
logger.info(f"Started container {self._container_name} from image {self._image_name}.") logger.info(f"Started container {self._container_name} from image {self._image_name}.")
DS.client_nodes.append(self) DS.client_nodes.append(self)
def set_rest_api(self):
self._api = REST(self._tcp_port)
def set_invalid_rest_api(self):
self._api = InvalidRest(self._tcp_port)
@retry(stop=stop_after_delay(5), wait=wait_fixed(0.1), reraise=True) @retry(stop=stop_after_delay(5), wait=wait_fixed(0.1), reraise=True)
def stop(self): def stop(self):
self._container = stop(self._container) self._container = stop(self._container)
@ -94,8 +88,14 @@ class ProxyClient:
def name(self): def name(self):
return self._container_name return self._container_name
def send_dispersal_request(self, data): def send_dispersal_request(self, data, send_invalid=False):
if send_invalid:
return self._invalid_api.send_dispersal_request(data)
return self._api.send_dispersal_request(data) return self._api.send_dispersal_request(data)
def send_get_data_range_request(self, 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._api.send_get_range(data) return self._api.send_get_range(data)

12
src/steps/da.py
View File

@ -56,11 +56,7 @@ class StepsDataAvailability(StepsCommon):
if client_node is None: if client_node is None:
response = executor.send_dispersal_request(request) response = executor.send_dispersal_request(request)
else: else:
if send_invalid: response = client_node.send_dispersal_request(request, send_invalid=send_invalid)
client_node.set_invalid_rest_api()
else:
client_node.set_rest_api()
response = client_node.send_dispersal_request(request)
except Exception as ex: except Exception as ex:
assert "Bad Request" in str(ex) or "Internal Server Error" in str(ex) assert "Bad Request" in str(ex) or "Internal Server Error" in str(ex)
@ -81,11 +77,7 @@ class StepsDataAvailability(StepsCommon):
if client_node is None: if client_node is None:
response = node.send_get_data_range_request(query) response = node.send_get_data_range_request(query)
else: else:
if send_invalid: response = client_node.send_get_data_range_request(query, send_invalid=send_invalid)
client_node.set_invalid_rest_api()
else:
client_node.set_rest_api()
response = client_node.send_get_data_range_request(query)
except Exception as ex: except Exception as ex:
assert "Bad Request" in str(ex) or "Internal Server Error" in str(ex) assert "Bad Request" in str(ex) or "Internal Server Error" in str(ex)