refactory store services, small tidy

Author: ross-weir

crates/chaincash_store/src/ergo_boxes.rs

@@ -32,11 +32,11 @@ impl TryFrom<&NetworkBox> for NewErgoBox {
     }
 }
 
-pub struct ErgoBoxService {
+pub struct ErgoBoxRepository {
     pool: ConnectionPool,
 }
 
-impl ErgoBoxService {
+impl ErgoBoxRepository {
     pub(crate) fn new(pool: ConnectionPool) -> Self {
         Self { pool }
     }

crates/chaincash_store/src/lib.rs

@@ -7,10 +7,10 @@ pub mod schema;
 use diesel::r2d2::{ConnectionManager, Pool};
 use diesel::SqliteConnection;
 use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
-use ergo_boxes::ErgoBoxService;
+use ergo_boxes::ErgoBoxRepository;
 pub use error::Error;
-use notes::NoteService;
-use reserves::ReserveService;
+use notes::NoteRepository;
+use reserves::ReserveRepository;
 use std::borrow::BorrowMut;
 
 #[derive(serde::Deserialize, Debug)]
@@ -34,7 +34,7 @@ pub struct ChainCashStore {
 
 impl ChainCashStore {
     pub fn open<S: Into<String>>(store_url: S) -> Result<Self, Error> {
-        let manager = ConnectionManager::<SqliteConnection>::new(store_url);
+        let manager = ConnectionManager::<ConnectionType>::new(store_url);
 
         Ok(Self {
             pool: Pool::builder().build(manager)?,
@@ -45,16 +45,16 @@ impl ChainCashStore {
         Self::open(":memory:")
     }
 
-    pub fn notes(&self) -> NoteService {
-        NoteService::new(self.pool.clone())
+    pub fn notes(&self) -> NoteRepository {
+        NoteRepository::new(self.pool.clone())
     }
 
-    pub fn reserves(&self) -> ReserveService {
-        ReserveService::new(self.pool.clone())
+    pub fn reserves(&self) -> ReserveRepository {
+        ReserveRepository::new(self.pool.clone())
     }
 
-    pub fn ergo_boxes(&self) -> ErgoBoxService {
-        ErgoBoxService::new(self.pool.clone())
+    pub fn ergo_boxes(&self) -> ErgoBoxRepository {
+        ErgoBoxRepository::new(self.pool.clone())
     }
 }
 

crates/chaincash_store/src/notes.rs

@@ -2,11 +2,11 @@ use crate::ConnectionPool;
 
 pub struct Note {}
 
-pub struct NoteService {
+pub struct NoteRepository {
     pool: ConnectionPool,
 }
 
-impl NoteService {
+impl NoteRepository {
     pub(crate) fn new(pool: ConnectionPool) -> Self {
         Self { pool }
     }

crates/chaincash_store/src/reserves.rs

@@ -1,4 +1,4 @@
-use crate::ergo_boxes::ErgoBoxService;
+use crate::ergo_boxes::ErgoBoxRepository;
 use crate::schema;
 use crate::ConnectionPool;
 use crate::Error;
@@ -22,11 +22,11 @@ pub struct NewReserve<'a> {
     pub owner: &'a str,
 }
 
-pub struct ReserveService {
+pub struct ReserveRepository {
     pool: ConnectionPool,
 }
 
-impl ReserveService {
+impl ReserveRepository {
     pub(crate) fn new(pool: ConnectionPool) -> Self {
         Self { pool }
     }
@@ -35,7 +35,7 @@ impl ReserveService {
         let reserve_spec = ReserveBoxSpec::try_from(ergo_box)?;
         let mut conn = self.pool.get()?;
         let created_box =
-            ErgoBoxService::create_with_conn(conn.borrow_mut(), ergo_box.try_into()?)?;
+            ErgoBoxRepository::create_with_conn(conn.borrow_mut(), ergo_box.try_into()?)?;
         let new_reserve = NewReserve {
             box_id: created_box.id,
             owner: &reserve_spec.owner.to_string(),