Expose sub-queriers directly in MockQuerier

Author: chipshort

contracts/cyberpunk/src/contract.rs

@@ -254,7 +254,7 @@ mod tests {
     fn query_denoms_works() {
         let mut deps = setup();
 
-        deps.querier.set_denom_metadata(
+        deps.querier.bank.set_denom_metadata(
             &(0..98)
                 .map(|i| DenomMetadata {
                     symbol: format!("FOO{i}"),

contracts/hackatom/src/contract.rs

@@ -444,7 +444,9 @@ mod tests {
         assert_eq!(init_res.messages.len(), 0);
 
         // balance changed in init
-        deps.querier.update_balance(MOCK_CONTRACT_ADDR, init_amount);
+        deps.querier
+            .bank
+            .update_balance(MOCK_CONTRACT_ADDR, init_amount);
 
         // beneficiary can release it
         let execute_info = mock_info(verifier.as_str(), &[]);
@@ -490,7 +492,9 @@ mod tests {
         assert_eq!(init_res.messages.len(), 0);
 
         // balance changed in init
-        deps.querier.update_balance(MOCK_CONTRACT_ADDR, init_amount);
+        deps.querier
+            .bank
+            .update_balance(MOCK_CONTRACT_ADDR, init_amount);
 
         // beneficiary cannot release it
         let execute_info = mock_info(beneficiary.as_str(), &[]);

contracts/ibc-reflect/src/contract.rs

@@ -614,7 +614,7 @@ mod tests {
         connect(deps.as_mut(), channel_id, &account);
         // assign it some funds
         let funds = vec![coin(123456, "uatom"), coin(7654321, "tgrd")];
-        deps.querier.update_balance(&account, funds.clone());
+        deps.querier.bank.update_balance(&account, funds.clone());
 
         // channel should be listed and have balance
         let raw = query(deps.as_ref(), mock_env(), QueryMsg::ListAccounts {}).unwrap();

contracts/staking/src/contract.rs

@@ -608,6 +608,7 @@ mod tests {
         let rebond_msg = ExecuteMsg::_BondAllTokens {};
         let info = mock_info(MOCK_CONTRACT_ADDR, &[]);
         deps.querier
+            .bank
             .update_balance(MOCK_CONTRACT_ADDR, coins(500, "ustake"));
         let _ = execute(deps.as_mut(), mock_env(), info, rebond_msg).unwrap();
 
@@ -699,12 +700,13 @@ mod tests {
         let rebond_msg = ExecuteMsg::_BondAllTokens {};
         let info = mock_info(MOCK_CONTRACT_ADDR, &[]);
         deps.querier
+            .bank
             .update_balance(MOCK_CONTRACT_ADDR, coins(500, "ustake"));
         let _ = execute(deps.as_mut(), mock_env(), info, rebond_msg).unwrap();
 
         // update the querier with new bond, lower balance
         set_delegation(&mut deps.querier, 1500, "ustake");
-        deps.querier.update_balance(MOCK_CONTRACT_ADDR, vec![]);
+        deps.querier.bank.update_balance(MOCK_CONTRACT_ADDR, vec![]);
 
         // creator now tries to unbond these tokens - this must fail
         let unbond_msg = ExecuteMsg::Unbond {

packages/std/src/testing/mock.rs

@@ -462,11 +462,11 @@ pub type MockQuerierCustomHandlerResult = SystemResult<ContractResult<Binary>>;
 /// MockQuerier holds an immutable table of bank balances
 /// and configurable handlers for Wasm queries and custom queries.
 pub struct MockQuerier<C: DeserializeOwned = Empty> {
-    bank: BankQuerier,
+    pub bank: BankQuerier,
     #[cfg(feature = "staking")]
     staking: StakingQuerier,
     #[cfg(feature = "cosmwasm_1_3")]
-    distribution: DistributionQuerier,
+    pub distribution: DistributionQuerier,
     wasm: WasmQuerier,
     #[cfg(feature = "stargate")]
     ibc: IbcQuerier,
@@ -497,46 +497,6 @@ impl<C: DeserializeOwned> MockQuerier<C> {
         }
     }
 
-    // set a new balance for the given address and return the old balance
-    pub fn update_balance(
-        &mut self,
-        addr: impl Into<String>,
-        balance: Vec<Coin>,
-    ) -> Option<Vec<Coin>> {
-        self.bank.update_balance(addr, balance)
-    }
-
-    pub fn set_denom_metadata(&mut self, denom_metadata: &[DenomMetadata]) {
-        self.bank.set_denom_metadata(denom_metadata);
-    }
-
-    #[cfg(feature = "cosmwasm_1_3")]
-    pub fn set_withdraw_address(
-        &mut self,
-        delegator_address: impl Into<String>,
-        withdraw_address: impl Into<String>,
-    ) {
-        self.distribution
-            .set_withdraw_address(delegator_address, withdraw_address);
-    }
-
-    /// Sets multiple withdraw addresses.
-    ///
-    /// This allows passing multiple tuples of `(delegator_address, withdraw_address)`.
-    /// It does not overwrite existing entries.
-    #[cfg(feature = "cosmwasm_1_3")]
-    pub fn set_withdraw_addresses(
-        &mut self,
-        withdraw_addresses: impl IntoIterator<Item = (impl Into<String>, impl Into<String>)>,
-    ) {
-        self.distribution.set_withdraw_addresses(withdraw_addresses);
-    }
-
-    #[cfg(feature = "cosmwasm_1_3")]
-    pub fn clear_withdraw_addresses(&mut self) {
-        self.distribution.clear_withdraw_addresses();
-    }
-
     #[cfg(feature = "staking")]
     pub fn update_staking(
         &mut self,
@@ -690,6 +650,7 @@ impl BankQuerier {
         }
     }
 
+    /// set a new balance for the given address and return the old balance
     pub fn update_balance(
         &mut self,
         addr: impl Into<String>,

packages/vm/src/testing/querier.rs

@@ -32,7 +32,7 @@ impl<C: CustomQuery + DeserializeOwned> MockQuerier<C> {
         addr: impl Into<String>,
         balance: Vec<Coin>,
     ) -> Option<Vec<Coin>> {
-        self.querier.update_balance(addr, balance)
+        self.querier.bank.update_balance(addr, balance)
     }
 
     #[cfg(feature = "staking")]