using path constants for route definition

nymtech · Jan 16, 2025 · f67f567 · f67f567
1 parent d5cf081
commit f67f567
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 18 deletions.
diff --git a/common/client-libs/validator-client/src/nym_api/mod.rs b/common/client-libs/validator-client/src/nym_api/mod.rs
@@ -183,8 +183,8 @@ pub trait NymApiClientExt: ApiClient {
         self.get_json(
             &[
                 routes::API_VERSION,
-                "nym-nodes",
-                "performance-history",
+                routes::NYM_NODES_ROUTES,
+                routes::NYM_NODES_PERFORMANCE_HISTORY,
                 &*node_id.to_string(),
             ],
             &params,
@@ -208,8 +208,15 @@ pub trait NymApiClientExt: ApiClient {
             params.push(("per_page", per_page.to_string()))
         }
 
-        self.get_json(&[routes::API_VERSION, "nym-nodes", "described"], &params)
-            .await
+        self.get_json(
+            &[
+                routes::API_VERSION,
+                routes::NYM_NODES_ROUTES,
+                routes::NYM_NODES_DESCRIBED,
+            ],
+            &params,
+        )
+        .await
     }
 
     #[tracing::instrument(level = "debug", skip_all)]
@@ -228,8 +235,15 @@ pub trait NymApiClientExt: ApiClient {
             params.push(("per_page", per_page.to_string()))
         }
 
-        self.get_json(&[routes::API_VERSION, "nym-nodes", "bonded"], &params)
-            .await
+        self.get_json(
+            &[
+                routes::API_VERSION,
+                routes::NYM_NODES_ROUTES,
+                routes::NYM_NODES_BONDED,
+            ],
+            &params,
+        )
+        .await
     }
 
     #[deprecated]
@@ -239,7 +253,7 @@ pub trait NymApiClientExt: ApiClient {
             &[
                 routes::API_VERSION,
                 "unstable",
-                "nym-nodes",
+                routes::NYM_NODES_ROUTES,
                 "mixnodes",
                 "skimmed",
             ],
@@ -255,7 +269,7 @@ pub trait NymApiClientExt: ApiClient {
             &[
                 routes::API_VERSION,
                 "unstable",
-                "nym-nodes",
+                routes::NYM_NODES_ROUTES,
                 "gateways",
                 "skimmed",
             ],
@@ -267,7 +281,11 @@ pub trait NymApiClientExt: ApiClient {
     #[instrument(level = "debug", skip(self))]
     async fn get_rewarded_set(&self) -> Result<RewardedSetResponse, NymAPIError> {
         self.get_json(
-            &[routes::API_VERSION, "nym-nodes", "rewarded-set"],
+            &[
+                routes::API_VERSION,
+                routes::NYM_NODES_ROUTES,
+                routes::NYM_NODES_REWARDED_SET,
+            ],
             NO_PARAMS,
         )
         .await
@@ -300,7 +318,7 @@ pub trait NymApiClientExt: ApiClient {
             &[
                 routes::API_VERSION,
                 "unstable",
-                "nym-nodes",
+                routes::NYM_NODES_ROUTES,
                 "skimmed",
                 "entry-gateways",
                 "all",
@@ -337,7 +355,7 @@ pub trait NymApiClientExt: ApiClient {
             &[
                 routes::API_VERSION,
                 "unstable",
-                "nym-nodes",
+                routes::NYM_NODES_ROUTES,
                 "skimmed",
                 "mixnodes",
                 "active",
@@ -374,7 +392,7 @@ pub trait NymApiClientExt: ApiClient {
             &[
                 routes::API_VERSION,
                 "unstable",
-                "nym-nodes",
+                routes::NYM_NODES_ROUTES,
                 "skimmed",
                 "mixnodes",
                 "all",
@@ -406,7 +424,12 @@ pub trait NymApiClientExt: ApiClient {
         }
 
         self.get_json(
-            &[routes::API_VERSION, "unstable", "nym-nodes", "skimmed"],
+            &[
+                routes::API_VERSION,
+                "unstable",
+                routes::NYM_NODES_ROUTES,
+                "skimmed",
+            ],
             &params,
         )
         .await
@@ -715,8 +738,8 @@ pub trait NymApiClientExt: ApiClient {
         self.get_json(
             &[
                 routes::API_VERSION,
-                "nym-nodes",
-                "performance",
+                routes::NYM_NODES_ROUTES,
+                routes::NYM_NODES_PERFORMANCE,
                 &node_id.to_string(),
             ],
             NO_PARAMS,
@@ -731,8 +754,8 @@ pub trait NymApiClientExt: ApiClient {
         self.get_json(
             &[
                 routes::API_VERSION,
-                "nym-nodes",
-                "annotation",
+                routes::NYM_NODES_ROUTES,
+                routes::NYM_NODES_ANNOTATION,
                 &node_id.to_string(),
             ],
             NO_PARAMS,
@@ -956,7 +979,11 @@ pub trait NymApiClientExt: ApiClient {
         request: &NodeRefreshBody,
     ) -> Result<(), NymAPIError> {
         self.post_json(
-            &[routes::API_VERSION, "nym-nodes", "refresh-described"],
+            &[
+                routes::API_VERSION,
+                routes::NYM_NODES_ROUTES,
+                routes::NYM_NODES_REFRESH_DESCRIBED,
+            ],
             NO_PARAMS,
             request,
         )

diff --git a/common/client-libs/validator-client/src/nym_api/routes.rs b/common/client-libs/validator-client/src/nym_api/routes.rs
@@ -34,6 +34,19 @@ pub mod ecash {
     pub const EPOCH_ID_PARAM: &str = "epoch_id";
 }
 
+pub const NYM_NODES_ROUTES: &str = "nym-nodes";
+
+pub use nym_nodes::*;
+pub mod nym_nodes {
+    pub const NYM_NODES_PERFORMANCE_HISTORY: &str = "performance-history";
+    pub const NYM_NODES_PERFORMANCE: &str = "performance";
+    pub const NYM_NODES_ANNOTATION: &str = "annotation";
+    pub const NYM_NODES_DESCRIBED: &str = "described";
+    pub const NYM_NODES_BONDED: &str = "bonded";
+    pub const NYM_NODES_REWARDED_SET: &str = "rewarded-set";
+    pub const NYM_NODES_REFRESH_DESCRIBED: &str = "refresh-described";
+}
+
 pub const STATUS_ROUTES: &str = "status";
 pub const API_STATUS_ROUTES: &str = "api-status";
 pub const HEALTH: &str = "health";