fix: some renamings in vshard.rs

src/vshard.rs

@@ -39,11 +39,14 @@ pub fn get_replicaset_uuid_by_bucket_id(tier: &str, bucket_id: u64) -> Result<St
         .map_err(|e| tlua::LuaError::from(e).into())
 }
 
+type ReplicasetUuid = String;
+type InstanceUuid = String;
+
 #[rustfmt::skip]
 #[derive(serde::Serialize, serde::Deserialize)]
 #[derive(Default, Clone, Debug, PartialEq, tlua::PushInto, tlua::Push, tlua::LuaRead)]
 pub struct VshardConfig {
-    sharding: HashMap<ReplicasetId, ReplicasetSpec>,
+    sharding: HashMap<ReplicasetUuid, ReplicasetSpec>,
     discovery_mode: DiscoveryMode,
 
     /// This field is not stored in the global storage, instead
@@ -58,7 +61,7 @@ pub struct VshardConfig {
 #[derive(serde::Serialize, serde::Deserialize)]
 #[derive(Default, Clone, Debug, PartialEq, tlua::PushInto, tlua::Push, tlua::LuaRead)]
 struct ReplicasetSpec {
-    replicas: HashMap<InstanceId, ReplicaSpec>,
+    replicas: HashMap<InstanceUuid, ReplicaSpec>,
     weight: Option<Weight>,
 }
 
@@ -111,7 +114,7 @@ impl VshardConfig {
         replicasets: &HashMap<&ReplicasetId, &Replicaset>,
         tier_name: &str,
     ) -> Self {
-        let mut sharding: HashMap<ReplicasetId, ReplicasetSpec> = HashMap::new();
+        let mut sharding: HashMap<ReplicasetUuid, ReplicasetSpec> = HashMap::new();
         for peer in instances {
             if !peer.may_respond() || peer.tier != tier_name {
                 continue;
@@ -130,14 +133,14 @@ impl VshardConfig {
             };
 
             let replicaset = sharding
-                .entry(ReplicasetId(peer.replicaset_uuid.clone()))
+                .entry(peer.replicaset_uuid.clone())
                 .or_insert_with(|| ReplicasetSpec {
                     weight: Some(r.weight),
                     ..Default::default()
                 });
 
             replicaset.replicas.insert(
-                InstanceId(peer.instance_uuid.clone()),
+                peer.instance_uuid.clone(),
                 ReplicaSpec {
                     uri: format!("{PICO_SERVICE_USER_NAME}@{address}"),
                     master: r.current_master_id == peer.instance_id,