From a95acd5c1ad64397fa19bcb5ffc2899664c13dc3 Mon Sep 17 00:00:00 2001
From: ankona <3595025+ankona@users.noreply.github.com>
Date: Thu, 5 Sep 2024 15:21:39 -0500
Subject: [PATCH] undo reverting snake-case naming changes

---
 ex/high_throughput_inference/mock_app.py                    | 6 +++---
 ex/high_throughput_inference/standalone_worker_manager.py   | 2 +-
 .../mli/infrastructure/storage/backbone_feature_store.py    | 4 ++--
 tests/dragon/test_featurestore.py                           | 4 ++--
 tests/dragon/test_protoclient.py                            | 6 +++---
 tests/test_featurestore.py                                  | 6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ex/high_throughput_inference/mock_app.py b/ex/high_throughput_inference/mock_app.py
index 365a46c90e..349c3fc619 100644
--- a/ex/high_throughput_inference/mock_app.py
+++ b/ex/high_throughput_inference/mock_app.py
@@ -57,9 +57,9 @@
 import numbers
 
 from collections import OrderedDict
-from smartsim._core.mli.comm.channel.dragonchannel import DragonCommChannel
-from smartsim._core.mli.comm.channel.dragonfli import DragonFLIChannel
-from smartsim._core.mli.infrastructure.storage.featurestore import ReservedKeys
+from smartsim._core.mli.comm.channel.dragon_channel import DragonCommChannel
+from smartsim._core.mli.comm.channel.dragon_fli import DragonFLIChannel
+from smartsim._core.mli.infrastructure.storage.feature_store import ReservedKeys
 from smartsim._core.mli.message_handler import MessageHandler
 from smartsim._core.mli.infrastructure.storage.backbone_feature_store import (
     BackboneFeatureStore,
diff --git a/ex/high_throughput_inference/standalone_worker_manager.py b/ex/high_throughput_inference/standalone_worker_manager.py
index 97932d0fdf..95fe461d80 100644
--- a/ex/high_throughput_inference/standalone_worker_manager.py
+++ b/ex/high_throughput_inference/standalone_worker_manager.py
@@ -71,7 +71,7 @@
 from smartsim._core.mli.infrastructure.storage.dragon_feature_store import (
     DragonFeatureStore,
 )
-from smartsim._core.mli.infrastructure.storage.featurestore import ReservedKeys
+from smartsim._core.mli.infrastructure.storage.feature_store import ReservedKeys
 from smartsim._core.mli.infrastructure.worker.worker import MachineLearningWorkerBase
 from smartsim.log import get_logger
 
diff --git a/smartsim/_core/mli/infrastructure/storage/backbone_feature_store.py b/smartsim/_core/mli/infrastructure/storage/backbone_feature_store.py
index 4163dea177..15f697e6ae 100644
--- a/smartsim/_core/mli/infrastructure/storage/backbone_feature_store.py
+++ b/smartsim/_core/mli/infrastructure/storage/backbone_feature_store.py
@@ -73,7 +73,6 @@ def __init__(
         self,
         storage: "dragon_ddict.DDict",
         allow_reserved_writes: bool = False,
-        wait_timeout: float = 30,
     ) -> None:
         """Initialize the DragonFeatureStore instance
 
@@ -153,8 +152,9 @@ def from_writable_descriptor(
                 f"Error creating dragon feature store: {descriptor}"
             ) from ex
 
+    @staticmethod
     def _check_wait_timeout(
-        self, start_time: float, timeout: float, indicators: t.Dict[str, bool]
+        start_time: float, timeout: float, indicators: t.Dict[str, bool]
     ) -> None:
         """Perform timeout verification
 
diff --git a/tests/dragon/test_featurestore.py b/tests/dragon/test_featurestore.py
index 5661144cfd..fa073040ed 100644
--- a/tests/dragon/test_featurestore.py
+++ b/tests/dragon/test_featurestore.py
@@ -36,7 +36,7 @@
 
 dragon = pytest.importorskip("dragon")
 
-from smartsim._core.mli.comm.channel.dragonchannel import DragonCommChannel
+from smartsim._core.mli.comm.channel.dragon_channel import DragonCommChannel
 from smartsim._core.mli.infrastructure.storage.backbone_feature_store import (
     BackboneFeatureStore,
     EventBroadcaster,
@@ -48,7 +48,7 @@
 from smartsim._core.mli.infrastructure.storage.backbone_feature_store import (
     time as bbtime,
 )
-from smartsim._core.mli.infrastructure.storage.dragonfeaturestore import dragon_ddict
+from smartsim._core.mli.infrastructure.storage.dragon_feature_store import dragon_ddict
 from smartsim.log import get_logger
 
 logger = get_logger(__name__)
diff --git a/tests/dragon/test_protoclient.py b/tests/dragon/test_protoclient.py
index a49424b369..b0a6c9397a 100644
--- a/tests/dragon/test_protoclient.py
+++ b/tests/dragon/test_protoclient.py
@@ -32,14 +32,14 @@
 
 dragon = pytest.importorskip("dragon")
 
-from smartsim._core.mli.comm.channel.dragonfli import DragonFLIChannel
+from smartsim._core.mli.comm.channel.dragon_fli import DragonFLIChannel
 from smartsim._core.mli.infrastructure.storage.backbone_feature_store import (
     BackboneFeatureStore,
     EventBroadcaster,
     OnWriteFeatureStore,
 )
-from smartsim._core.mli.infrastructure.storage.dragonfeaturestore import dragon_ddict
-from smartsim._core.mli.infrastructure.storage.featurestore import ReservedKeys
+from smartsim._core.mli.infrastructure.storage.dragon_feature_store import dragon_ddict
+from smartsim._core.mli.infrastructure.storage.feature_store import ReservedKeys
 from smartsim.error.errors import SmartSimError
 from smartsim.log import get_logger
 
diff --git a/tests/test_featurestore.py b/tests/test_featurestore.py
index a7314c7667..55d5fb8933 100644
--- a/tests/test_featurestore.py
+++ b/tests/test_featurestore.py
@@ -43,13 +43,13 @@
 from smartsim._core.mli.infrastructure.storage.backbone_feature_store import (
     time as bbtime,
 )
-from smartsim._core.mli.infrastructure.storage.dragonfeaturestore import (
+from smartsim._core.mli.infrastructure.storage.dragon_feature_store import (
     DragonFeatureStore,
 )
-from smartsim._core.mli.infrastructure.storage.featurestore import ReservedKeys
+from smartsim._core.mli.infrastructure.storage.feature_store import ReservedKeys
 from smartsim.error import SmartSimError
 from tests.mli.channel import FileSystemCommChannel
-from tests.mli.featurestore import MemoryFeatureStore
+from tests.mli.feature_store import MemoryFeatureStore
 
 if t.TYPE_CHECKING:
     import conftest