Skip to content

Commit 6d321fd

Browse files
committed
Move current VSS KVStoreSync logic to _internal methods
.. first step to make review easier.
1 parent 09eacfa commit 6d321fd

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
@@ -126,10 +126,8 @@ impl VssStore {
126126
}
127127
Ok(keys)
128128
}
129-
}
130129

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

163-
fn write(
161+
fn write_internal(
164162
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
165163
) -> io::Result<()> {
166164
check_namespace_key_validity(primary_namespace, secondary_namespace, Some(key), "write")?;
@@ -188,7 +186,7 @@ impl KVStoreSync for VssStore {
188186
Ok(())
189187
}
190188

191-
fn remove(
189+
fn remove_internal(
192190
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
193191
) -> io::Result<()> {
194192
check_namespace_key_validity(primary_namespace, secondary_namespace, Some(key), "remove")?;
@@ -211,7 +209,9 @@ impl KVStoreSync for VssStore {
211209
Ok(())
212210
}
213211

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

217217
let keys = self
@@ -229,6 +229,30 @@ impl KVStoreSync for VssStore {
229229
}
230230
}
231231

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

0 commit comments

Comments
 (0)