Remove update_* functions from MockQuerier

Author: chipshort

CHANGELOG.md

@@ -75,8 +75,9 @@ and this project adheres to
 - cosmwasm-std: Add `QueryRequest::Grpc` and deprecate `QueryRequest::Stargate`.
   ([#1973])
 - cosmwasm-std: Remove `update_balance`, `set_denom_metadata`,
-  `set_withdraw_address`, `set_withdraw_addresses`, `clear_withdraw_addresses`
-  from `MockQuerier` and expose the underlying queriers directly. ([#1977])
+  `set_withdraw_address`, `set_withdraw_addresses`, `clear_withdraw_addresses`,
+  `update_ibc` and `update_staking` from `MockQuerier` and expose the underlying
+  queriers directly. ([#1977])
 
 [#1874]: https://github.com/CosmWasm/cosmwasm/pull/1874
 [#1876]: https://github.com/CosmWasm/cosmwasm/pull/1876

MIGRATING.md

@@ -198,6 +198,10 @@ major releases of `cosmwasm`. Note that you can also view the
   +querier.bank.update_balance("addr", coins(1000, "ATOM"));
   -querier.set_withdraw_address("delegator", "withdrawer");
   +querier.distribution.set_withdraw_address("delegator", "withdrawer");
+  -querier.update_staking(denom, &[], &[]);
+  +querier.staking.update(denom, &[], &[]);
+  -querier.update_ibc(port_id, &[]);
+  +querier.ibc.update(port_id, &[]);
   ```
 
 - If you were using `QueryRequest::Stargate`, you might want to enable the

contracts/staking/src/contract.rs

@@ -406,7 +406,7 @@ pub fn query_investment(deps: Deps) -> StdResult<InvestmentResponse> {
 mod tests {
     use super::*;
     use cosmwasm_std::testing::{
-        mock_dependencies, mock_env, mock_info, MockQuerier, MOCK_CONTRACT_ADDR,
+        mock_dependencies, mock_env, mock_info, MockQuerier, StakingQuerier, MOCK_CONTRACT_ADDR,
     };
     use cosmwasm_std::{coins, Addr, Coin, CosmosMsg, Decimal, FullDelegation, Validator};
     use std::str::FromStr;
@@ -431,11 +431,12 @@ mod tests {
     }
 
     fn set_validator(querier: &mut MockQuerier) {
-        querier.update_staking("ustake", &[sample_validator(DEFAULT_VALIDATOR)], &[]);
+        querier.staking =
+            StakingQuerier::new("ustake", &[sample_validator(DEFAULT_VALIDATOR)], &[]);
     }
 
     fn set_delegation(querier: &mut MockQuerier, amount: u128, denom: &str) {
-        querier.update_staking(
+        querier.staking.update(
             "ustake",
             &[sample_validator(DEFAULT_VALIDATOR)],
             &[sample_delegation(DEFAULT_VALIDATOR, coin(amount, denom))],
@@ -467,7 +468,8 @@ mod tests {
     fn initialization_with_missing_validator() {
         let mut deps = mock_dependencies();
         deps.querier
-            .update_staking("ustake", &[sample_validator("john")], &[]);
+            .staking
+            .update("ustake", &[sample_validator("john")], &[]);
 
         let creator = deps.api.addr_make("creator").to_string();
         let msg = InstantiateMsg {
@@ -493,7 +495,7 @@ mod tests {
     #[test]
     fn proper_initialization() {
         let mut deps = mock_dependencies();
-        deps.querier.update_staking(
+        deps.querier.staking.update(
             "ustake",
             &[
                 sample_validator("john"),

packages/std/src/testing/mock.rs

@@ -464,12 +464,12 @@ pub type MockQuerierCustomHandlerResult = SystemResult<ContractResult<Binary>>;
 pub struct MockQuerier<C: DeserializeOwned = Empty> {
     pub bank: BankQuerier,
     #[cfg(feature = "staking")]
-    staking: StakingQuerier,
+    pub staking: StakingQuerier,
     #[cfg(feature = "cosmwasm_1_3")]
     pub distribution: DistributionQuerier,
     wasm: WasmQuerier,
     #[cfg(feature = "stargate")]
-    ibc: IbcQuerier,
+    pub ibc: IbcQuerier,
     /// A handler to handle custom queries. This is set to a dummy handler that
     /// always errors by default. Update it via `with_custom_handler`.
     ///
@@ -497,21 +497,6 @@ impl<C: DeserializeOwned> MockQuerier<C> {
         }
     }
 
-    #[cfg(feature = "staking")]
-    pub fn update_staking(
-        &mut self,
-        denom: &str,
-        validators: &[crate::query::Validator],
-        delegations: &[crate::query::FullDelegation],
-    ) {
-        self.staking = StakingQuerier::new(denom, validators, delegations);
-    }
-
-    #[cfg(feature = "stargate")]
-    pub fn update_ibc(&mut self, port_id: &str, channels: &[IbcChannel]) {
-        self.ibc = IbcQuerier::new(port_id, channels);
-    }
-
     pub fn update_wasm<WH: 'static>(&mut self, handler: WH)
     where
         WH: Fn(&WasmQuery) -> QuerierResult,
@@ -800,6 +785,12 @@ impl IbcQuerier {
         }
     }
 
+    /// Update the querier's configuration
+    pub fn update(&mut self, port_id: impl Into<String>, channels: &[IbcChannel]) {
+        self.port_id = port_id.into();
+        self.channels = channels.to_vec();
+    }
+
     pub fn query(&self, request: &IbcQuery) -> QuerierResult {
         let contract_result: ContractResult<Binary> = match request {
             IbcQuery::Channel {
@@ -863,6 +854,18 @@ impl StakingQuerier {
         }
     }
 
+    /// Update the querier's configuration
+    pub fn update(
+        &mut self,
+        denom: impl Into<String>,
+        validators: &[Validator],
+        delegations: &[FullDelegation],
+    ) {
+        self.denom = denom.into();
+        self.validators = validators.to_vec();
+        self.delegations = delegations.to_vec();
+    }
+
     pub fn query(&self, request: &StakingQuery) -> QuerierResult {
         let contract_result: ContractResult<Binary> = match request {
             StakingQuery::BondedDenom {} => {

packages/vm/src/testing/querier.rs

@@ -42,7 +42,7 @@ impl<C: CustomQuery + DeserializeOwned> MockQuerier<C> {
         validators: &[cosmwasm_std::Validator],
         delegations: &[cosmwasm_std::FullDelegation],
     ) {
-        self.querier.update_staking(denom, validators, delegations);
+        self.querier.staking.update(denom, validators, delegations);
     }
 
     pub fn update_wasm<WH: 'static>(&mut self, handler: WH)