Skip to content

Commit dd1b844

Browse files
committed
Refactor infallible build_key to not return an error
1 parent 7f672ce commit dd1b844

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
@@ -115,14 +115,12 @@ impl VssStoreInner {
115115
Self { client, store_id, storable_builder, key_obfuscator }
116116
}
117117

118-
fn build_key(
119-
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
120-
) -> io::Result<String> {
118+
fn build_key(&self, primary_namespace: &str, secondary_namespace: &str, key: &str) -> String {
121119
let obfuscated_key = self.key_obfuscator.obfuscate(key);
122120
if primary_namespace.is_empty() {
123-
Ok(obfuscated_key)
121+
obfuscated_key
124122
} else {
125-
Ok(format!("{}#{}#{}", primary_namespace, secondary_namespace, obfuscated_key))
123+
format!("{}#{}#{}", primary_namespace, secondary_namespace, obfuscated_key)
126124
}
127125
}
128126

@@ -174,7 +172,7 @@ impl VssStoreInner {
174172
check_namespace_key_validity(primary_namespace, secondary_namespace, Some(key), "read")?;
175173
let request = GetObjectRequest {
176174
store_id: self.store_id.clone(),
177-
key: self.build_key(primary_namespace, secondary_namespace, key)?,
175+
key: self.build_key(primary_namespace, secondary_namespace, key),
178176
};
179177
let resp = self.client.get_object(&request).await.map_err(|e| {
180178
let msg = format!(
@@ -210,7 +208,7 @@ impl VssStoreInner {
210208
store_id: self.store_id.clone(),
211209
global_version: None,
212210
transaction_items: vec![KeyValue {
213-
key: self.build_key(primary_namespace, secondary_namespace, key)?,
211+
key: self.build_key(primary_namespace, secondary_namespace, key),
214212
version,
215213
value: storable.encode_to_vec(),
216214
}],
@@ -235,7 +233,7 @@ impl VssStoreInner {
235233
let request = DeleteObjectRequest {
236234
store_id: self.store_id.clone(),
237235
key_value: Some(KeyValue {
238-
key: self.build_key(primary_namespace, secondary_namespace, key)?,
236+
key: self.build_key(primary_namespace, secondary_namespace, key),
239237
version: -1,
240238
value: vec![],
241239
}),

0 commit comments

Comments
 (0)