Skip to content

Commit 51eadb8

Browse files
committed
Move current VSS KVStoreSync logic to _internal methods
.. first step to make review easier.
1 parent f3dea63 commit 51eadb8

File tree

1 file changed

+30
-6
lines changed

1 file changed

+30
-6
lines changed

src/io/vss_store.rs

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,8 @@ impl VssStore {
125125
}
126126
Ok(keys)
127127
}
128-
}
129128

130-
impl KVStoreSync for VssStore {
131-
fn read(
129+
fn read_internal(
132130
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
133131
) -> io::Result<Vec<u8>> {
134132
check_namespace_key_validity(primary_namespace, secondary_namespace, Some(key), "read")?;
@@ -159,7 +157,7 @@ impl KVStoreSync for VssStore {
159157
Ok(self.storable_builder.deconstruct(storable)?.0)
160158
}
161159

162-
fn write(
160+
fn write_internal(
163161
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
164162
) -> io::Result<()> {
165163
check_namespace_key_validity(primary_namespace, secondary_namespace, Some(key), "write")?;
@@ -187,7 +185,7 @@ impl KVStoreSync for VssStore {
187185
Ok(())
188186
}
189187

190-
fn remove(
188+
fn remove_internal(
191189
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
192190
) -> io::Result<()> {
193191
check_namespace_key_validity(primary_namespace, secondary_namespace, Some(key), "remove")?;
@@ -210,7 +208,9 @@ impl KVStoreSync for VssStore {
210208
Ok(())
211209
}
212210

213-
fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
211+
fn list_internal(
212+
&self, primary_namespace: &str, secondary_namespace: &str,
213+
) -> io::Result<Vec<String>> {
214214
check_namespace_key_validity(primary_namespace, secondary_namespace, None, "list")?;
215215

216216
let keys = self
@@ -228,6 +228,30 @@ impl KVStoreSync for VssStore {
228228
}
229229
}
230230

231+
impl KVStoreSync for VssStore {
232+
fn read(
233+
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
234+
) -> io::Result<Vec<u8>> {
235+
self.read_internal(primary_namespace, secondary_namespace, key)
236+
}
237+
238+
fn write(
239+
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
240+
) -> io::Result<()> {
241+
self.write_internal(primary_namespace, secondary_namespace, key, buf)
242+
}
243+
244+
fn remove(
245+
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
246+
) -> io::Result<()> {
247+
self.remove_internal(primary_namespace, secondary_namespace, key, lazy)
248+
}
249+
250+
fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
251+
self.list_internal(primary_namespace, secondary_namespace)
252+
}
253+
}
254+
231255
fn derive_data_encryption_and_obfuscation_keys(vss_seed: &[u8; 32]) -> ([u8; 32], [u8; 32]) {
232256
let hkdf = |initial_key_material: &[u8], salt: &[u8]| -> [u8; 32] {
233257
let mut engine = HmacEngine::<sha256::Hash>::new(salt);

0 commit comments

Comments
 (0)