logos-messaging/logos-messaging-interop-tests
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-interop-tests.git synced 2026-02-26 16:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add go_waku support

Browse Source
This commit is contained in:
Roman 2024-06-05 21:09:01 +02:00
parent 62385b2072
commit df2e5e32b2
No known key found for this signature in database
GPG Key ID: B8FE070B54E11B75
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/common.py
View File

@ -40,12 +40,15 @@ def gen_step_id():
return f"{datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}__{str(uuid.uuid4())}" return f"{datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}__{str(uuid.uuid4())}"
def peer_info2id(peer): def peer_info2id(peer, is_nwaku=True):
return peer_info2multiaddr(peer).split("/")[-1] return peer_info2multiaddr(peer, is_nwaku).split("/")[-1]
def peer_info2multiaddr(peer): def peer_info2multiaddr(peer, is_nwaku=True):
return peer["multiaddr"] if is_nwaku:
return peer["multiaddr"]
else:
return peer["multiaddrs"][0]
def multiaddr2id(multiaddr): def multiaddr2id(multiaddr):

34
tests/peer_connection_management/test_peer_store.py
View File

@ -12,6 +12,7 @@ class TestPeerStore(StepsRelay):
def test_get_peers(self): def test_get_peers(self):
nodes = [self.node1, self.node2] nodes = [self.node1, self.node2]
nodes.extend(self.optional_nodes) nodes.extend(self.optional_nodes)
ids = [] ids = []
for node in nodes: for node in nodes:
node_id = node.get_id() node_id = node.get_id()
@ -20,36 +21,33 @@ class TestPeerStore(StepsRelay):
for i in range(5): for i in range(5):
others = [] others = []
for peer_info in nodes[i].get_peers(): for peer_info in nodes[i].get_peers():
others.append(peer_info2id(peer_info)) peer_id = peer_info2id(peer_info, nodes[i].is_nwaku())
others.append(peer_id)
assert (i == 0 and len(others) == 4) or (i > 0 and len(others) == 1), f"Some nodes missing in the peer store of Node ID {ids[i]}" assert (i == 0 and len(others) == 4) or (i > 0 and len(others) >= 1), f"Some nodes missing in the peer store of Node ID {ids[i]}"
def test_add_peers(self): def test_add_peers(self):
nodes = [self.node1, self.node2] nodes = [self.node1, self.node2]
nodes.extend(self.optional_nodes) nodes.extend(self.optional_nodes)
# Get peers 1-4 peers_multiaddr = set()
peers_info = nodes[0].get_peers() for i in range(2):
assert len(peers_info) == 4, f"Some nodes missing in the peer store of Node 1" for peer_info in nodes[i].get_peers():
multiaddr = peer_info2multiaddr(peer_info, nodes[i].is_nwaku())
peers_multiaddr.add(multiaddr)
# Get peer 0 assert len(peers_multiaddr) == 5, f"Exactly 5 multi addresses are expected"
peers_info.extend(nodes[1].get_peers())
assert len(peers_info) == 5, f"Node 1 missing in the peer store of Node 2"
# Convert to multi addresses
peers_multiaddr = []
for peer in peers_info:
multiaddr = peer_info2multiaddr(peer)
logger.debug(f"Peer info {peer}")
logger.debug(f"Peer multi address {multiaddr}")
peers_multiaddr.append(multiaddr)
# Add peers one by one excluding self for Nodes 2-5 # Add peers one by one excluding self for Nodes 2-5
for i in range(1, 5): for i in range(1, 5):
for peer in peers_multiaddr: for peer in list(peers_multiaddr):
if nodes[i].get_id() != multiaddr2id(peer): if nodes[i].get_id() != multiaddr2id(peer):
try: try:
nodes[i].add_peers([peer]) if nodes[i].is_nwaku():
nodes[i].add_peers([peer])
else:
peer_info = {"multiaddr": peer, "shards": [0], "protocols": ["/vac/waku/relay/2.0.0"]}
nodes[i].add_peers(peer_info)
except Exception as ex: except Exception as ex:
logger.error(f"Failed to add peer to Node {i} peer store: {ex}") logger.error(f"Failed to add peer to Node {i} peer store: {ex}")
raise raise