diff --git a/orm/src/schema.rs b/orm/src/schema.rs index 155b45ad..c55a0b60 100644 --- a/orm/src/schema.rs +++ b/orm/src/schema.rs @@ -1,31 +1,59 @@ // @generated automatically by Diesel CLI. pub mod sql_types { - #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)] + #[derive( + diesel::query_builder::QueryId, + std::fmt::Debug, + diesel::sql_types::SqlType, + )] #[diesel(postgres_type(name = "governance_kind"))] pub struct GovernanceKind; - #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)] + #[derive( + diesel::query_builder::QueryId, + std::fmt::Debug, + diesel::sql_types::SqlType, + )] #[diesel(postgres_type(name = "governance_result"))] pub struct GovernanceResult; - #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)] + #[derive( + diesel::query_builder::QueryId, + std::fmt::Debug, + diesel::sql_types::SqlType, + )] #[diesel(postgres_type(name = "governance_tally_type"))] pub struct GovernanceTallyType; - #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)] + #[derive( + diesel::query_builder::QueryId, + std::fmt::Debug, + diesel::sql_types::SqlType, + )] #[diesel(postgres_type(name = "transaction_kind"))] pub struct TransactionKind; - #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)] + #[derive( + diesel::query_builder::QueryId, + std::fmt::Debug, + diesel::sql_types::SqlType, + )] #[diesel(postgres_type(name = "transaction_result"))] pub struct TransactionResult; - #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)] + #[derive( + diesel::query_builder::QueryId, + std::fmt::Debug, + diesel::sql_types::SqlType, + )] #[diesel(postgres_type(name = "validator_state"))] pub struct ValidatorState; - #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)] + #[derive( + diesel::query_builder::QueryId, + std::fmt::Debug, + diesel::sql_types::SqlType, + )] #[diesel(postgres_type(name = "vote_kind"))] pub struct VoteKind; } diff --git a/parameters/src/services/namada.rs b/parameters/src/services/namada.rs index 807013b9..7c8e3ec2 100644 --- a/parameters/src/services/namada.rs +++ b/parameters/src/services/namada.rs @@ -11,9 +11,7 @@ use namada_sdk::queries::RPC; use namada_sdk::rpc::{ self, get_token_total_supply, get_total_staked_tokens, query_storage_value, }; -use namada_sdk::token::{ - Amount as NamadaSdkAmount, -}; +use namada_sdk::token::Amount as NamadaSdkAmount; use shared::balance::Amount; use shared::block::Epoch; use shared::gas::GasPrice; diff --git a/shared/src/balance.rs b/shared/src/balance.rs index 475a3216..eec0d1d6 100644 --- a/shared/src/balance.rs +++ b/shared/src/balance.rs @@ -2,9 +2,10 @@ use std::fmt::Display; use bigdecimal::BigDecimal; use fake::Fake; -use namada_sdk::token::Amount as NamadaAmount; -use namada_sdk::token::DenominatedAmount as NamadaDenominatedAmount; -use namada_sdk::token::Denomination as NamadaDenomination; +use namada_sdk::token::{ + Amount as NamadaAmount, DenominatedAmount as NamadaDenominatedAmount, + Denomination as NamadaDenomination, +}; use crate::id::Id; diff --git a/webserver/src/dto/governance.rs b/webserver/src/dto/governance.rs index 46578430..02ff84a6 100644 --- a/webserver/src/dto/governance.rs +++ b/webserver/src/dto/governance.rs @@ -1,8 +1,6 @@ use serde::{Deserialize, Serialize}; use validator::Validate; -use super::utils::Pagination; - #[derive(Clone, Debug, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub enum ProposalStatus { @@ -23,8 +21,8 @@ pub enum ProposalKind { #[derive(Clone, Serialize, Deserialize, Validate)] pub struct ProposalQueryParams { - #[serde(flatten)] - pub pagination: Option, + #[validate(range(min = 1, max = 10000))] + pub page: Option, pub status: Option, pub kind: Option, pub pattern: Option, @@ -32,6 +30,6 @@ pub struct ProposalQueryParams { #[derive(Clone, Serialize, Deserialize, Validate)] pub struct ProposalVotesQueryparams { - #[serde(flatten)] - pub pagination: Option, + #[validate(range(min = 1, max = 10000))] + pub page: Option, } diff --git a/webserver/src/dto/mod.rs b/webserver/src/dto/mod.rs index c571acbb..d7b2ca3e 100644 --- a/webserver/src/dto/mod.rs +++ b/webserver/src/dto/mod.rs @@ -1,3 +1,2 @@ pub mod governance; pub mod pos; -pub mod utils; diff --git a/webserver/src/dto/utils.rs b/webserver/src/dto/utils.rs deleted file mode 100644 index aea26e99..00000000 --- a/webserver/src/dto/utils.rs +++ /dev/null @@ -1,8 +0,0 @@ -use serde::{Deserialize, Serialize}; -use validator::Validate; - -#[derive(Debug, Clone, Serialize, Deserialize, Validate)] -pub struct Pagination { - #[validate(range(min = 1, max = 10000))] - pub page: u64, -} diff --git a/webserver/src/handler/governance.rs b/webserver/src/handler/governance.rs index c359ac83..218b3f0e 100644 --- a/webserver/src/handler/governance.rs +++ b/webserver/src/handler/governance.rs @@ -16,7 +16,7 @@ pub async fn get_governance_proposals( Query(query): Query, State(state): State, ) -> Result>>, ApiError> { - let page = query.pagination.map(|p| p.page).unwrap_or(1); + let page = query.page.unwrap_or(1); let (proposals, total_pages, total_items) = state .gov_service .find_governance_proposals( @@ -57,7 +57,7 @@ pub async fn get_governance_proposal_votes( Query(query): Query, State(state): State, ) -> Result>>, ApiError> { - let page = query.pagination.map(|p| p.page).unwrap_or(1); + let page = query.page.unwrap_or(1); let (proposal_votes, total_pages, total_votes) = state .gov_service .find_governance_proposal_votes(proposal_id, page) diff --git a/webserver/src/response/gas.rs b/webserver/src/response/gas.rs index e348aaac..9f804d7a 100644 --- a/webserver/src/response/gas.rs +++ b/webserver/src/response/gas.rs @@ -1,9 +1,8 @@ use orm::gas::{GasDb, GasPriceDb}; use serde::{Deserialize, Serialize}; -use crate::service::utils::raw_amount_to_nam; - use super::transaction::TransactionKind; +use crate::service::utils::raw_amount_to_nam; #[derive(Clone, Debug, Deserialize, Serialize)] #[serde(rename_all = "camelCase")]