Skip to content

Commit 9d08b27

Browse files
committed
Refactor infallible build_key to not return an error
1 parent af2864d commit 9d08b27

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/io/vss_store.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,12 @@ impl VssStoreInner {
116116
Self { client, store_id, storable_builder, key_obfuscator }
117117
}
118118

119-
fn build_key(
120-
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
121-
) -> io::Result<String> {
119+
fn build_key(&self, primary_namespace: &str, secondary_namespace: &str, key: &str) -> String {
122120
let obfuscated_key = self.key_obfuscator.obfuscate(key);
123121
if primary_namespace.is_empty() {
124-
Ok(obfuscated_key)
122+
obfuscated_key
125123
} else {
126-
Ok(format!("{}#{}#{}", primary_namespace, secondary_namespace, obfuscated_key))
124+
format!("{}#{}#{}", primary_namespace, secondary_namespace, obfuscated_key)
127125
}
128126
}
129127

@@ -175,7 +173,7 @@ impl VssStoreInner {
175173
check_namespace_key_validity(primary_namespace, secondary_namespace, Some(key), "read")?;
176174
let request = GetObjectRequest {
177175
store_id: self.store_id.clone(),
178-
key: self.build_key(primary_namespace, secondary_namespace, key)?,
176+
key: self.build_key(primary_namespace, secondary_namespace, key),
179177
};
180178
let resp = self.client.get_object(&request).await.map_err(|e| {
181179
let msg = format!(
@@ -211,7 +209,7 @@ impl VssStoreInner {
211209
store_id: self.store_id.clone(),
212210
global_version: None,
213211
transaction_items: vec![KeyValue {
214-
key: self.build_key(primary_namespace, secondary_namespace, key)?,
212+
key: self.build_key(primary_namespace, secondary_namespace, key),
215213
version,
216214
value: storable.encode_to_vec(),
217215
}],
@@ -236,7 +234,7 @@ impl VssStoreInner {
236234
let request = DeleteObjectRequest {
237235
store_id: self.store_id.clone(),
238236
key_value: Some(KeyValue {
239-
key: self.build_key(primary_namespace, secondary_namespace, key)?,
237+
key: self.build_key(primary_namespace, secondary_namespace, key),
240238
version: -1,
241239
value: vec![],
242240
}),

0 commit comments

Comments
 (0)