mock search API (#293)

* mock search API

* Revert files that should be untracked

Co-authored-by: dkijania <[email protected]>

Author: cameron1024

Cargo.lock

@@ -29,7 +29,7 @@ rand_chacha = "0.2"
 tokio = { version = "1.1", features = ["macros","rt","rt-multi-thread"] }
 chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
 catalyst-toolbox = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "main", features=["test-api"]}
-snapshot-lib = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "main", features=["proptest", "test-api"]}
+snapshot-lib = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "main", features=["test-api"]}
 thiserror = "1.0"
 netstat2 = "0.9"
 image = "0.23.9"

integration-tests/Cargo.toml

@@ -0,0 +1,122 @@
+use crate::Vote;
+
+use crate::common::iapyx_from_mainnet;
+use crate::common::MainnetWallet;
+use assert_fs::TempDir;
+use catalyst_toolbox::rewards::voters::calc_voter_rewards;
+use catalyst_toolbox::snapshot::RawSnapshot;
+use catalyst_toolbox::snapshot::Snapshot;
+use chain_impl_mockchain::block::BlockDate;
+use jormungandr_automation::testing::time;
+use jormungandr_lib::crypto::account::Identifier;
+use vit_servicing_station_tests::common::data::ArbitraryValidVotingTemplateGenerator;
+use vitup::config::VoteBlockchainTime;
+use vitup::config::{Block0Initials, ConfigBuilder};
+use vitup::testing::spawn_network;
+use vitup::testing::vitup_setup;
+use snapshot_lib::VotingGroup;
+
+#[test]
+pub fn voters_with_at_least_one_vote() {
+    let stake = 10_000;
+
+    let alice_wallet = MainnetWallet::new(stake);
+    let bob_wallet = MainnetWallet::new(stake);
+    let clarice_wallet = MainnetWallet::new(stake);
+
+    let raw_snapshot = vec![
+        alice_wallet.as_voting_registration(),
+        bob_wallet.as_voting_registration(),
+        clarice_wallet.as_voting_registration(),
+    ];
+
+    let assigner = |_: &Identifier| VotingGroup::new();
+
+    let snapshot = Snapshot::from_raw_snapshot(
+        RawSnapshot::from(raw_snapshot),
+        450.into(),
+        1.into(),
+        &assigner,
+    )
+    .unwrap();
+    let testing_directory = TempDir::new().unwrap().into_persistent();
+
+    let vote_timing = VoteBlockchainTime {
+        vote_start: 0,
+        tally_start: 1,
+        tally_end: 2,
+        slots_per_epoch: 30,
+    };
+    let config = ConfigBuilder::default()
+        .block0_initials(Block0Initials(vec![
+            alice_wallet.as_initial_entry(),
+            bob_wallet.as_initial_entry(),
+            clarice_wallet.as_initial_entry(),
+        ]))
+        .vote_timing(vote_timing.into())
+        .slot_duration_in_seconds(2)
+        .proposals_count(3)
+        .voting_power(100)
+        .private(false)
+        .build();
+
+    let mut template_generator = ArbitraryValidVotingTemplateGenerator::new();
+    let (mut controller, vit_parameters, network_params) =
+        vitup_setup(&config, testing_directory.path().to_path_buf()).unwrap();
+
+    let (nodes, _vit_station, wallet_proxy) = spawn_network(
+        &mut controller,
+        vit_parameters,
+        network_params,
+        &mut template_generator,
+    )
+    .unwrap();
+
+    let mut alice = iapyx_from_mainnet(&alice_wallet, &wallet_proxy).unwrap();
+    let mut bob = iapyx_from_mainnet(&bob_wallet, &wallet_proxy).unwrap();
+
+    let fund1_vote_plan = &controller.defined_vote_plans()[0];
+
+    alice
+        .vote_for(fund1_vote_plan.id(), 0, Vote::Yes as u8)
+        .unwrap();
+
+    bob.vote_for(fund1_vote_plan.id(), 1, Vote::Yes as u8)
+        .unwrap();
+
+    bob.vote_for(fund1_vote_plan.id(), 0, Vote::Yes as u8)
+        .unwrap();
+
+    let target_date = BlockDate {
+        epoch: 1,
+        slot_id: 0,
+    };
+    time::wait_for_date(target_date.into(), nodes[0].rest());
+
+    let _block0 = &controller.settings().block0;
+    let records = calc_voter_rewards(
+        nodes[0].rest().account_votes_count().unwrap(),
+        1,
+        snapshot.to_full_snapshot_info(),
+        100u32.into(),
+    )
+    .unwrap();
+
+    assert_eq!(
+        records
+            .iter()
+            .find(|(x, _y)| **x == alice_wallet.reward_address())
+            .unwrap()
+            .1,
+        &50u32.into()
+    );
+
+    assert_eq!(
+        records
+            .iter()
+            .find(|(x, _y)| **x == bob_wallet.reward_address())
+            .unwrap()
+            .1,
+        &50u32.into()
+    );
+}

integration-tests/src/backend/rewards/active_voters_rewards.rs

@@ -15,7 +15,7 @@ jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch
 jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" }
 chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
 catalyst-toolbox = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "main", features=["test-api"]}
-snapshot-lib = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "main", features=["proptest"] }
+snapshot-lib = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "main" }
 futures = "0.3.8"
 assert_fs = "1.0"
 serde = { version = "1", features = ["derive"] }

snapshot-trigger-service/Cargo.toml

@@ -85,19 +85,14 @@ impl ValigrindStartupCommand {
     }
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize, Default)]
 #[serde(untagged)]
 pub enum Protocol {
+    #[default]
     Http,
     Https(Certs),
 }
 
-impl Default for Protocol {
-    fn default() -> Self {
-        Self::Http
-    }
-}
-
 impl Protocol {
     pub fn schema(&self) -> String {
         match self {

valgrind/src/startup/mod.rs

@@ -30,7 +30,7 @@ jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch
 vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
 vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
 catalyst-toolbox = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "main"}
-snapshot-lib = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "main", features=["proptest"] }
+snapshot-lib = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "main" }
 valgrind = { path = "../valgrind" }
 poldercast = { git = "https://github.com/primetype/poldercast.git", rev = "8305f1560392a9d26673ca996e7646c8834533ef" }
 rand = "0.8"

vitup/Cargo.toml

@@ -2,7 +2,7 @@ use crate::config::Config;
 use catalyst_toolbox::kedqr::{generate, KeyQrCode};
 use chain_crypto::SecretKey;
 use chain_impl_mockchain::key::EitherEd25519SecretKey;
-use hersir::builder::WalletTemplate;
+use hersir::config::WalletTemplate;
 use image::ImageError;
 use std::collections::HashMap;
 use std::fs::File;
@@ -32,7 +32,7 @@ pub fn generate_qr_and_hashes<P: AsRef<Path>>(
         let pin = initials
             .iter()
             .find_map(|(template, pin)| {
-                if template.alias() == *alias {
+                if template.alias() == Some(alias.to_string()) {
                     Some(pin)
                 } else {
                     None

vitup/src/builders/helpers/qr.rs

@@ -146,7 +146,7 @@ pub fn build_servicing_station_parameters(
                 vote_plan: _vote_plan,
             } = data
             {
-                let key: ElectionPublicKey = keys.election_public_key();
+                let key: ElectionPublicKey = keys.election_key();
                 parameters
                     .current_fund
                     .set_vote_encryption_key(key.to_bech32_str(), &alias.alias);