Hide staking query types behind feature flag

Author: webmaster128

CHANGELOG.md

@@ -165,8 +165,11 @@ and this project adheres to
   `HumanAddr` to `String` ([#802]).
 - cosmwasm-std: `Api::addr_humanize` now returns `Addr` instead of `HumanAddr`
   ([#802]).
-- cosmwasm-std: Hide `StakingMsg` and `CosmosMsg::Staking` behind the `staking`
-  feature flag to make those only available in contracts built for PoS chains.
+- cosmwasm-std: Hide `StakingMsg`, `CosmosMsg::Staking`,
+  `AllDelegationsResponse`, `BondedDenomResponse`, `Delegation`,
+  `FullDelegation`, `StakingQuery`, `Validator`, `ValidatorsResponse` and
+  `testing::StakingQuerier` behind the `staking` feature flag to make those only
+  available in contracts built for PoS chains.
 - cosmwasm-std: Remove `StakingMsg::Withdraw` in favour of
   `DistributionMsg::SetWithdrawAddress` and
   `DistributionMsg::WithdrawDelegatorReward` ([#848]).

packages/std/src/lib.rs

@@ -42,9 +42,12 @@ pub use crate::ibc::{
 pub use crate::iterator::{Order, Pair, KV};
 pub use crate::math::{Decimal, Fraction, Uint128};
 pub use crate::query::{
-    AllBalanceResponse, AllDelegationsResponse, BalanceResponse, BankQuery, BondedDenomResponse,
-    CustomQuery, Delegation, FullDelegation, QueryRequest, StakingQuery, Validator,
-    ValidatorsResponse, WasmQuery,
+    AllBalanceResponse, BalanceResponse, BankQuery, CustomQuery, QueryRequest, WasmQuery,
+};
+#[cfg(feature = "staking")]
+pub use crate::query::{
+    AllDelegationsResponse, BondedDenomResponse, Delegation, FullDelegation, StakingQuery,
+    Validator, ValidatorsResponse,
 };
 pub use crate::results::{
     attr, wasm_execute, wasm_instantiate, Attribute, BankMsg, ContractResult, CosmosMsg, Empty,
@@ -88,10 +91,12 @@ pub use crate::ibc_exports::{
 mod mock;
 #[cfg(not(target_arch = "wasm32"))]
 pub mod testing {
+    #[cfg(feature = "staking")]
+    pub use crate::mock::StakingQuerier;
     pub use crate::mock::{
         digit_sum, mock_dependencies, mock_dependencies_with_balances, mock_env, mock_info,
         riffle_shuffle, BankQuerier, MockApi, MockQuerier, MockQuerierCustomHandlerResult,
-        MockStorage, StakingQuerier, MOCK_CONTRACT_ADDR,
+        MockStorage, MOCK_CONTRACT_ADDR,
     };
     #[cfg(feature = "stargate")]
     pub use crate::mock::{mock_ibc_channel, mock_ibc_packet_ack, mock_ibc_packet_recv};

packages/std/src/mock.rs

@@ -11,9 +11,12 @@ use crate::errors::{RecoverPubkeyError, StdError, StdResult, SystemError, Verifi
 #[cfg(feature = "stargate")]
 use crate::ibc::{IbcChannel, IbcEndpoint, IbcOrder, IbcPacket, IbcTimeoutBlock};
 use crate::query::{
-    AllBalanceResponse, AllDelegationsResponse, BalanceResponse, BankQuery, BondedDenomResponse,
-    CustomQuery, DelegationResponse, FullDelegation, QueryRequest, StakingQuery, Validator,
-    ValidatorsResponse, WasmQuery,
+    AllBalanceResponse, BalanceResponse, BankQuery, CustomQuery, QueryRequest, WasmQuery,
+};
+#[cfg(feature = "staking")]
+use crate::query::{
+    AllDelegationsResponse, BondedDenomResponse, DelegationResponse, FullDelegation, StakingQuery,
+    Validator, ValidatorsResponse,
 };
 use crate::results::{ContractResult, Empty, SystemResult};
 use crate::serde::{from_slice, to_binary};
@@ -280,6 +283,7 @@ pub type MockQuerierCustomHandlerResult = SystemResult<ContractResult<Binary>>;
 /// TODO: also allow querying contracts
 pub struct MockQuerier<C: DeserializeOwned = Empty> {
     bank: BankQuerier,
+    #[cfg(feature = "staking")]
     staking: StakingQuerier,
     // placeholder to add support later
     wasm: NoWasmQuerier,
@@ -294,6 +298,7 @@ impl<C: DeserializeOwned> MockQuerier<C> {
     pub fn new(balances: &[(&str, &[Coin])]) -> Self {
         MockQuerier {
             bank: BankQuerier::new(balances),
+            #[cfg(feature = "staking")]
             staking: StakingQuerier::default(),
             wasm: NoWasmQuerier {},
             // strange argument notation suggested as a workaround here: https://github.com/rust-lang/rust/issues/41078#issuecomment-294296365
@@ -353,6 +358,7 @@ impl<C: CustomQuery + DeserializeOwned> MockQuerier<C> {
         match &request {
             QueryRequest::Bank(bank_query) => self.bank.query(bank_query),
             QueryRequest::Custom(custom_query) => (*self.custom_handler)(custom_query),
+            #[cfg(feature = "staking")]
             QueryRequest::Staking(staking_query) => self.staking.query(staking_query),
             QueryRequest::Wasm(msg) => self.wasm.query(msg),
             #[cfg(feature = "stargate")]
@@ -427,13 +433,15 @@ impl BankQuerier {
     }
 }
 
+#[cfg(feature = "staking")]
 #[derive(Clone, Default)]
 pub struct StakingQuerier {
     denom: String,
     validators: Vec<Validator>,
     delegations: Vec<FullDelegation>,
 }
 
+#[cfg(feature = "staking")]
 impl StakingQuerier {
     pub fn new(denom: &str, validators: &[Validator], delegations: &[FullDelegation]) -> Self {
         StakingQuerier {
@@ -513,8 +521,9 @@ pub fn digit_sum(input: &[u8]) -> usize {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::query::Delegation;
-    use crate::{coin, coins, from_binary, Decimal};
+    use crate::{coin, coins, from_binary};
+    #[cfg(feature = "staking")]
+    use crate::{Decimal, Delegation};
     use hex_literal::hex;
 
     const SECP256K1_MSG_HASH_HEX: &str =
@@ -863,6 +872,7 @@ mod tests {
         assert_eq!(res.amount, coin(0, "ELF"));
     }
 
+    #[cfg(feature = "staking")]
     #[test]
     fn staking_querier_validators() {
         let val1 = Validator {
@@ -889,6 +899,7 @@ mod tests {
         assert_eq!(vals.validators, vec![val1, val2]);
     }
 
+    #[cfg(feature = "staking")]
     // gets delegators from query or panic
     fn get_all_delegators<U: Into<String>>(
         staking: &StakingQuerier,
@@ -904,6 +915,7 @@ mod tests {
         dels.delegations
     }
 
+    #[cfg(feature = "staking")]
     // gets full delegators from query or panic
     fn get_delegator<U: Into<String>, V: Into<String>>(
         staking: &StakingQuerier,
@@ -921,6 +933,7 @@ mod tests {
         dels.delegation
     }
 
+    #[cfg(feature = "staking")]
     #[test]
     fn staking_querier_delegations() {
         let val1 = String::from("validator-one");

packages/std/src/query/mod.rs

@@ -13,6 +13,7 @@ mod stargate;
 mod wasm;
 
 pub use bank::{AllBalanceResponse, BalanceResponse, BankQuery};
+#[cfg(feature = "staking")]
 pub use staking::{
     AllDelegationsResponse, BondedDenomResponse, Delegation, DelegationResponse, FullDelegation,
     StakingQuery, Validator, ValidatorsResponse,
@@ -27,6 +28,7 @@ pub use wasm::WasmQuery;
 pub enum QueryRequest<C: CustomQuery> {
     Bank(BankQuery),
     Custom(C),
+    #[cfg(feature = "staking")]
     Staking(StakingQuery),
     /// A Stargate query encoded the same way as abci_query, with path and protobuf encoded Data.
     /// The format is defined in [ADR-21](https://github.com/cosmos/cosmos-sdk/blob/master/docs/architecture/adr-021-protobuf-query-encoding.md)

packages/std/src/query/staking.rs

@@ -1,3 +1,5 @@
+#![cfg(feature = "staking")]
+
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};