diff --git a/src/libs/common.py b/src/libs/common.py
index fcad2b53..b7c57cb0 100644
--- a/src/libs/common.py
+++ b/src/libs/common.py
@@ -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]
diff --git a/src/node/waku_node.py b/src/node/waku_node.py
index 478b0edc..5bee24d1 100644
--- a/src/node/waku_node.py
+++ b/src/node/waku_node.py
@@ -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
diff --git a/tests/peer_connection_management/test_peer_store.py b/tests/peer_connection_management/test_peer_store.py
index 0ec3e4bf..5fa8ee7c 100644
--- a/tests/peer_connection_management/test_peer_store.py
+++ b/tests/peer_connection_management/test_peer_store.py
@@ -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