fix: update

Author: aoikurokawa

api/src/resolvers/query_resolver.rs

@@ -944,7 +944,7 @@ impl QueryResolver {
                 .arr
                 .iter()
                 .filter_map(|entry| {
-                    if epoch as u16 == entry.epoch {
+                    if epoch == entry.epoch {
                         Some(ValidatorHistoryEntryResponse::from_validator_history_entry(
                             entry,
                         ))

api/src/schemas/validator.rs

@@ -1,6 +1,5 @@
-use std::collections::HashMap;
-
 use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
 
 #[derive(Default, Serialize, Deserialize, Clone)]
 pub struct JitoStakeOverTimeResponse {

core/src/constants.rs

@@ -15,7 +15,6 @@ pub const JITOSOL_VALIDATOR_LIST_MAINNET: &str = "3R3nGZpQs2aZo5FDQvd2MUQ6R7KhAP
 pub const JITOSOL_VALIDATOR_LIST_TESTNET: &str = "G5N6K3qW86GSkNEpywcbJk42LjEZoshzECFg1LNVjSLa";
 pub const DATABASE_NAME: &str = "validators";
 pub const VALIDATOR_COLLECTION_NAME: &str = "validators";
-pub const BAM_VALIDATOR_COLLECTION_NAME: &str = "bam_validators";
 pub const STAKE_POOL_STATS_COLLECTION_NAME: &str = "stake_pool_stats";
 pub const VALIDATOR_REWARDS_COLLECTION_NAME: &str = "validator_rewards";
 pub const STAKER_REWARDS_COLLECTION_NAME: &str = "staker_rewards";

core/src/db_models/bam_validators.rs

@@ -8,7 +8,7 @@ use mongodb::{bson::doc, Collection};
 use serde::{Deserialize, Serialize};
 use solana_pubkey::{ParsePubkeyError, Pubkey};
 
-use crate::{constants::BAM_VALIDATOR_COLLECTION_NAME, db_models::error::DataStoreError};
+use crate::db_models::error::DataStoreError;
 
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
 pub struct BamValidator {
@@ -104,7 +104,7 @@ pub struct BamValidatorStore {
 }
 
 impl BamValidatorStore {
-    pub const COLLECTION: &'static str = BAM_VALIDATOR_COLLECTION_NAME;
+    pub const COLLECTION: &'static str = "bam_validators";
 
     /// Initialize a [`BamValidatorStore`]
     pub fn new(collection: Collection<BamValidator>) -> Self {

core/src/db_models/validators.rs

@@ -27,7 +27,6 @@ pub struct Validator {
     pub epoch: u64,
     pub epoch_credits: Option<u64>,
     pub identity_account: Option<String>,
-
     pub mev_commission_bps: Option<u16>,
     pub mev_revenue_lamports: u64,
     pub priority_fee_commission_bps: Option<u16>,

core/src/lib.rs

@@ -1,5 +1,5 @@
 use mongodb::{bson::doc, options::IndexOptions, Collection, IndexModel};
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 pub use solana_native_token::LAMPORTS_PER_SOL;
 
 use crate::db_models::validators::Validator;
@@ -26,7 +26,7 @@ pub async fn add_index(collection: &Collection<Validator>, key: &str) {
         .expect("add index failed");
 }
 
-#[derive(Clone, Copy, Eq, PartialEq, Serialize, Deserialize, Debug)]
+#[derive(Clone, Copy, Eq, PartialEq, Deserialize, Debug)]
 pub enum SortOrder {
     Asc,
     Desc,