Merge pull request #159 from input-output-hk/feature/create-snapshot-lib

Create new crate snapshot-lib

Author: Mr-Leshiy

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace]
 members = [
     "catalyst-toolbox",
-    "voting-hir"
+    "snapshot-lib"
 ]

Cargo.toml

@@ -62,7 +62,7 @@ graphql_client = { version = "0.10" }
 gag = "1"
 vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
 env_logger = "0.9"
-voting-hir = { path = "../voting-hir", features = ["serde"] }
+snapshot-lib = { path = "../snapshot-lib" }
 fraction = "0.10"
 
 [dev-dependencies]
@@ -74,7 +74,7 @@ chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch
 proptest = { git = "https://github.com/input-output-hk/proptest", branch = "master" }
 test-strategy = "0.2"
 serde_test = "1"
-voting-hir =  { path = "../voting-hir", features = ["serde", "proptest"] }
+snapshot-lib =  { path = "../snapshot-lib", features = ["proptest"] }
 vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
 
 [build-dependencies]

catalyst-toolbox/Cargo.toml

@@ -85,7 +85,7 @@ mod test {
 
     #[test]
     fn test_output_csv() {
-        let resource_input = "./resources/testing/valid_assessments.csv";
+        let resource_input = "../resources/testing/valid_assessments.csv";
         let tmp_file = assert_fs::NamedTempFile::new("outfile.csv").unwrap();
 
         let export = Export {

catalyst-toolbox/src/bin/cli/advisor_reviews/mod.rs

@@ -1,10 +1,10 @@
 use catalyst_toolbox::rewards::voters::{calc_voter_rewards, Rewards, Threshold, VoteCount};
-use catalyst_toolbox::snapshot::{registration::MainnetRewardAddress, SnapshotInfo};
 use catalyst_toolbox::utils::assert_are_close;
 use jormungandr_lib::{
     crypto::{account::Identifier, hash::Hash},
     interfaces::AccountVotes,
 };
+use snapshot_lib::{registration::MainnetRewardAddress, SnapshotInfo};
 use vit_servicing_station_lib::db::models::proposals::FullProposalInfo;
 
 use color_eyre::{eyre::eyre, Report};

catalyst-toolbox/src/bin/cli/rewards/voters.rs

@@ -1,8 +1,8 @@
-use catalyst_toolbox::snapshot::{voting_group::RepsVotersAssigner, RawSnapshot, Snapshot};
 use color_eyre::Report;
 use fraction::Fraction;
 use jcli_lib::utils::{output_file::OutputFile, output_format::OutputFormat};
 use jormungandr_lib::interfaces::Value;
+use snapshot_lib::{voting_group::RepsVotersAssigner, RawSnapshot, Snapshot};
 use std::fs::File;
 use std::io::Write;
 use std::path::PathBuf;

catalyst-toolbox/src/bin/cli/snapshot/mod.rs

@@ -145,7 +145,7 @@ mod tests {
 
     #[test]
     fn test_deserialize() {
-        let file_path = PathBuf::from("./resources/testing/valid_assessments.csv");
+        let file_path = PathBuf::from("../resources/testing/valid_assessments.csv");
         let data: Vec<AdvisorReviewRow> =
             csv_utils::load_data_from_csv::<_, b','>(&file_path).unwrap();
         assert_eq!(data.len(), 1);

catalyst-toolbox/src/community_advisors/models/de.rs

@@ -6,7 +6,6 @@ pub mod logs;
 pub mod notifications;
 pub mod recovery;
 pub mod rewards;
-pub mod snapshot;
 pub mod stats;
 pub mod utils;
 pub mod vca_reviews;

catalyst-toolbox/src/lib.rs

@@ -1,6 +1,6 @@
-use crate::snapshot::{registration::MainnetRewardAddress, SnapshotInfo};
 use jormungandr_lib::crypto::{account::Identifier, hash::Hash};
 use rust_decimal::Decimal;
+use snapshot_lib::{registration::MainnetRewardAddress, SnapshotInfo};
 use std::collections::{BTreeMap, HashMap, HashSet};
 use thiserror::Error;
 use vit_servicing_station_lib::db::models::proposals::FullProposalInfo;
@@ -167,11 +167,11 @@ pub fn calc_voter_rewards(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::snapshot::registration::*;
-    use crate::snapshot::*;
     use crate::utils::assert_are_close;
     use fraction::Fraction;
     use jormungandr_lib::crypto::account::Identifier;
+    use snapshot_lib::registration::{Delegations, VotingRegistration};
+    use snapshot_lib::Snapshot;
     use test_strategy::proptest;
 
     #[proptest]

catalyst-toolbox/src/rewards/voters.rs

@@ -2,8 +2,8 @@ use graphql_client::GraphQLQuery;
 
 #[derive(GraphQLQuery)]
 #[graphql(
-    query_path = "resources/explorer/transaction_by_id.graphql",
-    schema_path = "resources/explorer/schema.graphql",
+    query_path = "../resources/explorer/transaction_by_id.graphql",
+    schema_path = "../resources/explorer/schema.graphql",
     response_derives = "Debug"
 )]
 pub struct TransactionById;