fixup! Merge branch 'fraccaman/sdk-rpc-queries' (#2400)

crates/governance/src/storage/mod.rs

@@ -272,9 +272,9 @@ where
 pub fn get_proposal_result<S>(
     storage: &S,
     proposal_id: u64,
-) -> storage_api::Result<Option<ProposalResult>>
+) -> StorageResult<Option<ProposalResult>>
 where
-    S: storage_api::StorageRead,
+    S: StorageRead,
 {
     let key = governance_keys::get_proposal_result_key(proposal_id);
     let proposal_result: Option<ProposalResult> = storage.read(&key)?;

crates/sdk/src/queries/vp/governance.rs

@@ -54,10 +54,10 @@ where
 fn proposal_result<D, H, V, T>(
     ctx: RequestCtx<'_, D, H, V, T>,
     id: u64,
-) -> storage_api::Result<Option<ProposalResult>>
+) -> namada_storage::Result<Option<ProposalResult>>
 where
     D: 'static + DB + for<'iter> DBIter<'iter> + Sync,
     H: 'static + StorageHasher + Sync,
 {
-    storage_api::governance::get_proposal_result(ctx.wl_storage, id)
+    namada_governance::storage::get_proposal_result(ctx.wl_storage, id)
 }

crates/sdk/src/queries/vp/token.rs

@@ -29,7 +29,7 @@ where
 fn total_supply<D, H, V, T>(
     ctx: RequestCtx<'_, D, H, V, T>,
     addr: Address,
-) -> storage_api::Result<token::Amount>
+) -> namada_storage::Result<token::Amount>
 where
     D: 'static + DB + for<'iter> DBIter<'iter> + Sync,
     H: 'static + StorageHasher + Sync,

crates/sdk/src/rpc.rs

@@ -21,6 +21,7 @@ use namada_core::types::token::{
 };
 use namada_core::types::{storage, token};
 use namada_governance::parameters::GovernanceParameters;
+use namada_governance::pgf::parameters::PgfParameters;
 use namada_governance::pgf::storage::steward::StewardDetail;
 use namada_governance::storage::proposal::StorageProposal;
 use namada_governance::utils::{