fix: move Waku related methods to waku_node module

This commit is contained in:
Roman 2024-06-09 21:22:10 +02:00
parent 8449097d51
commit 63d7c36d4c
No known key found for this signature in database
GPG Key ID: B8FE070B54E11B75
3 changed files with 16 additions and 16 deletions

View File

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

View File

@ -39,6 +39,21 @@ def rln_credential_store_ready(creds_file_path):
raise FileNotFoundError(errno.ENOENT, os.strerror(errno.ENOENT), creds_file_path)
def peer_info2multiaddr(peer, is_nwaku=True):
if is_nwaku:
return peer["multiaddr"]
else:
return peer["multiaddrs"][0]
def peer_info2id(peer, is_nwaku=True):
return peer_info2multiaddr(peer, is_nwaku).split("/")[-1]
def multiaddr2id(multiaddr):
return multiaddr.split("/")[-1]
class WakuNode:
def __init__(self, docker_image, docker_log_prefix=""):
self._image_name = docker_image

View File

@ -1,7 +1,7 @@
import pytest
from src.libs.common import peer_info2id, peer_info2multiaddr, multiaddr2id, delay
from src.libs.custom_logger import get_custom_logger
from src.node.waku_node import peer_info2id, peer_info2multiaddr, multiaddr2id
from src.steps.peer_store import StepsPeerStore
from src.steps.relay import StepsRelay
from src.steps.store import StepsStore