From 55f1825a3c9e8b832394bcbf9a04b1414646915e Mon Sep 17 00:00:00 2001 From: bkioshn Date: Fri, 26 Jan 2024 18:51:34 +0700 Subject: [PATCH] fix: linter field name starts with the struct's name --- .../bin/src/event_db/queries/registration.rs | 2 +- .../bin/src/event_db/queries/vit_ss/fund.rs | 16 ++++++++-------- .../bin/src/event_db/types/registration.rs | 2 +- .../bin/src/event_db/types/vit_ss/challenge.rs | 4 ++-- .../bin/src/event_db/types/vit_ss/fund.rs | 8 ++++---- .../bin/src/event_db/types/vit_ss/goal.rs | 2 +- .../bin/src/event_db/types/vit_ss/group.rs | 2 +- .../service/common/objects/voter_registration.rs | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/catalyst-gateway/bin/src/event_db/queries/registration.rs b/catalyst-gateway/bin/src/event_db/queries/registration.rs index c45e597c00f..61e271a07da 100644 --- a/catalyst-gateway/bin/src/event_db/queries/registration.rs +++ b/catalyst-gateway/bin/src/event_db/queries/registration.rs @@ -155,7 +155,7 @@ impl RegistrationQueries for EventDB { }; Ok(Voter { - voter_info: VoterInfo { + info: VoterInfo { delegations_power: voter.try_get("delegations_power")?, delegations_count: voter.try_get("delegations_count")?, voting_power_saturation, diff --git a/catalyst-gateway/bin/src/event_db/queries/vit_ss/fund.rs b/catalyst-gateway/bin/src/event_db/queries/vit_ss/fund.rs index be9e3de13ec..7fa95b368b3 100644 --- a/catalyst-gateway/bin/src/event_db/queries/vit_ss/fund.rs +++ b/catalyst-gateway/bin/src/event_db/queries/vit_ss/fund.rs @@ -165,7 +165,7 @@ impl VitSSFundQueries for EventDB { challenges.push(Challenge { id: row.try_get("id")?, internal_id: row.try_get("internal_id")?, - challenge_type: row.try_get("challenge_type")?, + c_type: row.try_get("challenge_type")?, title: row.try_get("title")?, description: row.try_get("description")?, rewards_total: row @@ -175,7 +175,7 @@ impl VitSSFundQueries for EventDB { .try_get::<_, Option>("proposers_rewards")? .unwrap_or_default(), fund_id, - challenge_url: row + url: row .try_get::<_, Option>("challenge_url")? .unwrap_or_default(), highlights: row @@ -189,7 +189,7 @@ impl VitSSFundQueries for EventDB { for row in rows { goals.push(Goal { id: row.try_get("id")?, - goal_name: row.try_get("goal_name")?, + name: row.try_get("goal_name")?, fund_id, }); } @@ -198,7 +198,7 @@ impl VitSSFundQueries for EventDB { let mut groups = Vec::new(); for row in rows { groups.push(Group { - group_id: row.try_get("group_id")?, + g_id: row.try_get("group_id")?, token_identifier: row.try_get("token_identifier")?, fund_id, }); @@ -206,14 +206,14 @@ impl VitSSFundQueries for EventDB { let fund = Fund { id: fund_id, - fund_name: row.try_get("fund_name")?, - fund_goal: row.try_get("fund_goal")?, + name: row.try_get("fund_name")?, + goal: row.try_get("fund_goal")?, voting_power_threshold: row.try_get("voting_power_threshold")?, - fund_start_time: row + start_time: row .try_get::<_, NaiveDateTime>("fund_start_time")? .and_local_timezone(Utc) .unwrap(), - fund_end_time: row + end_time: row .try_get::<_, NaiveDateTime>("fund_end_time")? .and_local_timezone(Utc) .unwrap(), diff --git a/catalyst-gateway/bin/src/event_db/types/registration.rs b/catalyst-gateway/bin/src/event_db/types/registration.rs index e38c254c976..e57059a9b50 100644 --- a/catalyst-gateway/bin/src/event_db/types/registration.rs +++ b/catalyst-gateway/bin/src/event_db/types/registration.rs @@ -26,7 +26,7 @@ pub(crate) struct VoterInfo { /// Voter pub(crate) struct Voter { /// Voter info - pub(crate) voter_info: VoterInfo, + pub(crate) info: VoterInfo, /// As at pub(crate) as_at: DateTime, /// Last updated diff --git a/catalyst-gateway/bin/src/event_db/types/vit_ss/challenge.rs b/catalyst-gateway/bin/src/event_db/types/vit_ss/challenge.rs index 77ab7254980..2600bdfe5ed 100644 --- a/catalyst-gateway/bin/src/event_db/types/vit_ss/challenge.rs +++ b/catalyst-gateway/bin/src/event_db/types/vit_ss/challenge.rs @@ -9,12 +9,12 @@ pub(crate) struct Challenge { // this is used only to retain the original insert order pub(crate) internal_id: i32, pub(crate) id: i32, - pub(crate) challenge_type: String, + pub(crate) c_type: String, pub(crate) title: String, pub(crate) description: String, pub(crate) rewards_total: i64, pub(crate) proposers_rewards: i64, pub(crate) fund_id: i32, - pub(crate) challenge_url: String, + pub(crate) url: String, pub(crate) highlights: Option, } diff --git a/catalyst-gateway/bin/src/event_db/types/vit_ss/fund.rs b/catalyst-gateway/bin/src/event_db/types/vit_ss/fund.rs index b9993a1e921..12a1d69b83e 100644 --- a/catalyst-gateway/bin/src/event_db/types/vit_ss/fund.rs +++ b/catalyst-gateway/bin/src/event_db/types/vit_ss/fund.rs @@ -20,11 +20,11 @@ pub(crate) struct FundStageDates { #[derive(Debug, Clone, PartialEq, Eq)] pub(crate) struct Fund { pub(crate) id: i32, - pub(crate) fund_name: String, - pub(crate) fund_goal: String, + pub(crate) name: String, + pub(crate) goal: String, pub(crate) voting_power_threshold: i64, - pub(crate) fund_start_time: DateTime, - pub(crate) fund_end_time: DateTime, + pub(crate) start_time: DateTime, + pub(crate) end_time: DateTime, pub(crate) next_fund_start_time: DateTime, pub(crate) registration_snapshot_time: DateTime, pub(crate) next_registration_snapshot_time: DateTime, diff --git a/catalyst-gateway/bin/src/event_db/types/vit_ss/goal.rs b/catalyst-gateway/bin/src/event_db/types/vit_ss/goal.rs index c2820577e9b..2c41f49e4b4 100644 --- a/catalyst-gateway/bin/src/event_db/types/vit_ss/goal.rs +++ b/catalyst-gateway/bin/src/event_db/types/vit_ss/goal.rs @@ -1,6 +1,6 @@ #[derive(Debug, Clone, PartialEq, Eq)] pub(crate) struct Goal { pub(crate) id: i32, - pub(crate) goal_name: String, + pub(crate) name: String, pub(crate) fund_id: i32, } diff --git a/catalyst-gateway/bin/src/event_db/types/vit_ss/group.rs b/catalyst-gateway/bin/src/event_db/types/vit_ss/group.rs index f3f9dd40426..35c2135a785 100644 --- a/catalyst-gateway/bin/src/event_db/types/vit_ss/group.rs +++ b/catalyst-gateway/bin/src/event_db/types/vit_ss/group.rs @@ -2,5 +2,5 @@ pub(crate) struct Group { pub(crate) fund_id: i32, pub(crate) token_identifier: String, - pub(crate) group_id: String, + pub(crate) g_id: String, } diff --git a/catalyst-gateway/bin/src/service/common/objects/voter_registration.rs b/catalyst-gateway/bin/src/service/common/objects/voter_registration.rs index 4061851b4ac..756f9c580ab 100644 --- a/catalyst-gateway/bin/src/service/common/objects/voter_registration.rs +++ b/catalyst-gateway/bin/src/service/common/objects/voter_registration.rs @@ -39,7 +39,7 @@ impl TryFrom for VoterRegistration fn try_from(value: crate::event_db::types::registration::Voter) -> Result { Ok(Self { - voter_info: value.voter_info.try_into()?, + voter_info: value.info.try_into()?, as_at: value.as_at, last_updated: value.last_updated, is_final: value.is_final,