storage_tx -> storage_io

storage/src/demo_val.rs

@@ -4,8 +4,8 @@ use std::rc::Rc;
 use crate::rc_key::RcKey;
 use crate::storage_entity::StorageEntity;
 use crate::storage_entry::{StorageEntry, StorageEntryReader};
+use crate::storage_io::{StorageReader, StorageTxMut};
 use crate::storage_ptr::StorageEntryPtr;
-use crate::storage_tx::{StorageReader, StorageTxMut};
 use crate::{GenericError, Storage, StorageBackend};
 
 const NUMBER_TAG: u8 = 0;

storage/src/lib.rs

@@ -11,13 +11,13 @@ mod storage_auto_ptr;
 mod storage_backend;
 mod storage_entity;
 mod storage_entry;
+mod storage_io;
 mod storage_ptr;
-mod storage_tx;
 mod tests;
 
 pub use self::storage::Storage;
 pub use self::storage_backend::StorageBackend;
-pub use self::storage_tx::{StorageReader, StorageTxMut};
+pub use self::storage_io::{StorageReader, StorageTxMut};
 pub use errors::GenericError;
 pub use memory_backend::MemoryBackend;
 pub use rc_key::RcKey;

storage/src/memory_backend.rs

@@ -2,8 +2,8 @@ use std::{cell::RefCell, collections::HashMap, error::Error, rc::Weak};
 
 use crate::{
   rc_key::RcKey,
+  storage_io::{StorageReader, StorageTxMut},
   storage_ptr::StorageEntryPtr,
-  storage_tx::{StorageReader, StorageTxMut},
   GenericError, StorageBackend, StoragePtr,
 };
 

storage/src/sled_backend.rs

@@ -6,8 +6,8 @@ use sled::transaction::{
 
 use crate::{
   rc_key::RcKey,
+  storage_io::{StorageReader, StorageTxMut},
   storage_ptr::StorageEntryPtr,
-  storage_tx::{StorageReader, StorageTxMut},
   GenericError, StorageBackend, StoragePtr,
 };
 

storage/src/storage_auto_ptr.rs

@@ -1,7 +1,7 @@
 use std::fmt::{self, Debug};
 use std::{cell::RefCell, error::Error, rc::Weak};
 
-use crate::storage_tx::StorageReader;
+use crate::storage_io::StorageReader;
 use crate::{StorageBackend, StorageEntity, StorageEntryPtr};
 
 pub struct StorageAutoPtr<SB: StorageBackend, SE: StorageEntity<SB>> {

storage/src/storage_backend.rs

@@ -1,7 +1,7 @@
 use std::{cell::RefCell, error::Error, rc::Weak};
 
 use crate::{
-  storage_tx::{StorageReader, StorageTxMut},
+  storage_io::{StorageReader, StorageTxMut},
   GenericError,
 };
 

storage/src/storage_entity.rs

@@ -1,6 +1,6 @@
 use crate::{
   storage_entry::StorageEntry,
-  storage_tx::{StorageReader, StorageTxMut},
+  storage_io::{StorageReader, StorageTxMut},
   GenericError, StorageBackend,
 };
 

storage/src/storage_io.rs

@@ -67,6 +67,7 @@ pub trait StorageReader<SB: StorageBackend>: Sized {
 pub trait StorageTxMut<SB: StorageBackend>: StorageReader<SB> + Sized {
   fn ref_deltas(&mut self) -> &mut HashMap<(u64, u64, u64), i64>;
   fn cache(&mut self) -> &mut HashMap<RcKey, StorageEntryPtr>;
+
   fn write_bytes<T>(
     &mut self,
     ptr: StoragePtr<T>,