merge Snapshot and NewSnapshotEntry diesel structs

input-output-hk · May 3, 2022 · e619833 · e619833
1 parent bf82e2a
commit e619833
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/vit-servicing-station-lib/src/db/models/snapshot.rs b/vit-servicing-station-lib/src/db/models/snapshot.rs
@@ -1,15 +1,9 @@
 use super::super::schema::snapshot;
 use diesel::Queryable;
 
-#[derive(Queryable)]
-pub struct Snapshot {
-    pub voting_key: String,
-    pub voting_power: i64,
-}
-
-#[derive(Insertable)]
+#[derive(Queryable, Insertable)]
 #[table_name = "snapshot"]
-pub struct NewSnapshotEntry {
+pub struct SnapshotEntry {
     pub voting_key: String,
     pub voting_power: i64,
 }
diff --git a/vit-servicing-station-lib/src/server/snapshot_watcher.rs b/vit-servicing-station-lib/src/server/snapshot_watcher.rs
@@ -1,5 +1,5 @@
 use crate::{
-    db::{models::snapshot::NewSnapshotEntry, schema, DbConnectionPool},
+    db::{models::snapshot::SnapshotEntry, schema, DbConnectionPool},
     v0::context::SharedContext,
 };
 use diesel::{Connection, RunQueryDsl};
@@ -181,7 +181,7 @@ async fn load_snapshot_table_from_file(path: PathBuf, pool: DbConnectionPool) ->
                 .values(
                     snapshot
                         .iter()
-                        .map(|(vk, vp)| NewSnapshotEntry {
+                        .map(|(vk, vp)| SnapshotEntry {
                             voting_key: vk.clone(),
                             voting_power: vp.parse::<u64>().unwrap() as i64,
                         })

diff --git a/vit-servicing-station-lib/src/v0/endpoints/snapshot/handlers.rs b/vit-servicing-station-lib/src/v0/endpoints/snapshot/handlers.rs
@@ -1,5 +1,5 @@
 use crate::{
-    db::{models::snapshot::Snapshot, schema::snapshot},
+    db::{models::snapshot::SnapshotEntry, schema::snapshot},
     v0::{context::SharedContext, errors::HandleError, result::HandlerResult},
 };
 use diesel::prelude::*;
@@ -16,7 +16,7 @@ pub async fn get_voting_power(
         let db_conn = pool.get().map_err(HandleError::DatabaseError)?;
         crate::db::schema::snapshot::table
             .filter(snapshot::voting_key.eq(&voting_key))
-            .first::<Snapshot>(&db_conn)
+            .first::<SnapshotEntry>(&db_conn)
             .map_err(|_e| HandleError::NotFound(voting_key))
     })
     .await