Revert "Rename Querier types, for cleaner public Api"

This reverts commit a7efaa3.

Author: ethanfrey

contracts/burner/src/contract.rs

@@ -5,7 +5,12 @@ use cosmwasm_std::{
 
 use crate::msg::{HandleMsg, InitMsg, MigrateMsg, QueryMsg};
 
-pub fn init(_deps: Deps, _env: Env, _info: MessageInfo, _msg: InitMsg) -> StdResult<InitResponse> {
+pub fn init(
+    _deps: Deps,
+    _env: Env,
+    _info: MessageInfo,
+    _msg: InitMsg,
+) -> StdResult<InitResponse> {
     Err(StdError::generic_err(
         "You can only use this contract for migrations",
     ))

contracts/staking/src/contract.rs

@@ -1,6 +1,6 @@
 use cosmwasm_std::{
     attr, coin, to_binary, BankMsg, Binary, Decimal, Deps, DepsRef, Env, HandleResponse, HumanAddr,
-    InitResponse, MessageInfo, Querier, StakingMsg, StdError, StdResult, Uint128, WasmMsg,
+    InitResponse, MessageInfo, QuerierWrapper, StakingMsg, StdError, StdResult, Uint128, WasmMsg,
 };
 
 use crate::errors::{StakingError, Unauthorized};
@@ -100,7 +100,7 @@ pub fn transfer(
 
 // get_bonded returns the total amount of delegations from contract
 // it ensures they are all the same denom
-fn get_bonded(querier: &Querier, contract: &HumanAddr) -> StdResult<Uint128> {
+fn get_bonded(querier: &QuerierWrapper, contract: &HumanAddr) -> StdResult<Uint128> {
     let bonds = querier.query_all_delegations(contract)?;
     if bonds.is_empty() {
         return Ok(Uint128(0));

packages/std/src/deps.rs

@@ -1,11 +1,11 @@
-use crate::traits::{Api, QuerierTrait, Storage};
-use crate::Querier;
+use crate::traits::{Api, Querier, Storage};
+use crate::QuerierWrapper;
 
 /// Holds all external dependencies of the contract.
 /// Designed to allow easy dependency injection at runtime.
 /// This cannot be copied or cloned since it would behave differently
 /// for mock storages and a bridge storage in the VM.
-pub struct OwnedDeps<S: Storage, A: Api, Q: QuerierTrait> {
+pub struct OwnedDeps<S: Storage, A: Api, Q: Querier> {
     pub storage: S,
     pub api: A,
     pub querier: Q,
@@ -14,30 +14,30 @@ pub struct OwnedDeps<S: Storage, A: Api, Q: QuerierTrait> {
 pub struct Deps<'a> {
     pub storage: &'a mut dyn Storage,
     pub api: &'a dyn Api,
-    pub querier: Querier<'a>,
+    pub querier: QuerierWrapper<'a>,
 }
 
 #[derive(Copy, Clone)]
 pub struct DepsRef<'a> {
     pub storage: &'a dyn Storage,
     pub api: &'a dyn Api,
-    pub querier: Querier<'a>,
+    pub querier: QuerierWrapper<'a>,
 }
 
-impl<S: Storage, A: Api, Q: QuerierTrait> OwnedDeps<S, A, Q> {
+impl<S: Storage, A: Api, Q: Querier> OwnedDeps<S, A, Q> {
     pub fn as_ref(&'_ self) -> DepsRef<'_> {
         DepsRef {
             storage: &self.storage,
             api: &self.api,
-            querier: Querier::new(&self.querier),
+            querier: QuerierWrapper::new(&self.querier),
         }
     }
 
     pub fn as_mut(&'_ mut self) -> Deps<'_> {
         Deps {
             storage: &mut self.storage,
             api: &self.api,
-            querier: Querier::new(&self.querier),
+            querier: QuerierWrapper::new(&self.querier),
         }
     }
 }

packages/std/src/entry_points.rs

@@ -6,7 +6,7 @@
 /// The second module should export three functions with the following signatures:
 /// ```
 /// # use cosmwasm_std::{
-/// #     Storage, Api, QuerierTrait, Deps, DepsRef, Env, StdResult, Binary, MessageInfo,
+/// #     Storage, Api, Querier, Deps, DepsRef, Env, StdResult, Binary, MessageInfo,
 /// #     InitResult, HandleResult, QueryResult,
 /// # };
 /// #
@@ -94,7 +94,7 @@ macro_rules! create_entry_points {
 /// This macro is very similar to the `create_entry_points` macro, except it also requires the `migrate` method:
 /// ```
 /// # use cosmwasm_std::{
-/// #     Storage, Api, QuerierTrait, Deps, Env, StdResult, Binary, MigrateResult, MessageInfo,
+/// #     Storage, Api, Querier, Deps, Env, StdResult, Binary, MigrateResult, MessageInfo,
 /// # };
 /// # type MigrateMsg = ();
 /// pub fn migrate(

packages/std/src/imports.rs

@@ -6,7 +6,7 @@ use crate::errors::{StdError, StdResult, SystemError};
 use crate::memory::{alloc, build_region, consume_region, Region};
 use crate::results::SystemResult;
 use crate::serde::from_slice;
-use crate::traits::{Api, QuerierResult, QuerierTrait, ReadonlyStorage, Storage};
+use crate::traits::{Api, Querier, QuerierResult, ReadonlyStorage, Storage};
 #[cfg(feature = "iterator")]
 use crate::{
     iterator::{Order, KV},
@@ -217,7 +217,7 @@ impl ExternalQuerier {
     }
 }
 
-impl QuerierTrait for ExternalQuerier {
+impl Querier for ExternalQuerier {
     fn raw_query(&self, bin_request: &[u8]) -> QuerierResult {
         let req = build_region(bin_request);
         let request_ptr = &*req as *const Region as u32;

packages/std/src/lib.rs

@@ -38,7 +38,7 @@ pub use crate::results::{
 };
 pub use crate::serde::{from_binary, from_slice, to_binary, to_vec};
 pub use crate::storage::MemoryStorage;
-pub use crate::traits::{Api, Querier, QuerierResult, QuerierTrait, ReadonlyStorage, Storage};
+pub use crate::traits::{Api, Querier, QuerierResult, QuerierWrapper, ReadonlyStorage, Storage};
 pub use crate::types::{BlockInfo, ContractInfo, Empty, Env, MessageInfo};
 
 // Exposed in wasm build only

packages/std/src/mock.rs

@@ -14,7 +14,7 @@ use crate::query::{
 use crate::results::{ContractResult, SystemResult};
 use crate::serde::{from_slice, to_binary};
 use crate::storage::MemoryStorage;
-use crate::traits::{Api, QuerierResult, QuerierTrait};
+use crate::traits::{Api, Querier, QuerierResult};
 use crate::types::{BlockInfo, ContractInfo, Empty, Env, MessageInfo};
 
 pub const MOCK_CONTRACT_ADDR: &str = "cosmos2contract";
@@ -220,7 +220,7 @@ impl<C: DeserializeOwned> MockQuerier<C> {
     }
 }
 
-impl<C: CustomQuery + DeserializeOwned> QuerierTrait for MockQuerier<C> {
+impl<C: CustomQuery + DeserializeOwned> Querier for MockQuerier<C> {
     fn raw_query(&self, bin_request: &[u8]) -> QuerierResult {
         let request: QueryRequest<C> = match from_slice(bin_request) {
             Ok(v) => v,

packages/std/src/traits.rs

@@ -81,7 +81,7 @@ pub trait Api {
 /// A short-hand alias for the two-level query result (1. accessing the contract, 2. executing query in the contract)
 pub type QuerierResult = SystemResult<ContractResult<Binary>>;
 
-pub trait QuerierTrait {
+pub trait Querier {
     /// raw_query is all that must be implemented for the Querier.
     /// This allows us to pass through binary queries from one level to another without
     /// knowing the custom format, or we can decode it, with the knowledge of the allowed
@@ -91,18 +91,20 @@ pub trait QuerierTrait {
 }
 
 #[derive(Copy, Clone)]
-pub struct Querier<'a>(&'a dyn QuerierTrait);
+pub struct QuerierWrapper<'a> {
+    querier: &'a dyn Querier,
+}
 
-impl<'a> Querier<'a> {
-    pub fn new(querier: &'a dyn QuerierTrait) -> Self {
-        Querier(querier)
+impl<'a> QuerierWrapper<'a> {
+    pub fn new(querier: &'a dyn Querier) -> Self {
+        QuerierWrapper { querier }
     }
 
     /// This allows us to pass through binary queries from one level to another without
     /// knowing the custom format, or we can decode it, with the knowledge of the allowed
     /// types. You probably want one of the simpler auto-generated helper methods
     pub fn raw_query(&self, bin_request: &[u8]) -> QuerierResult {
-        self.0.raw_query(bin_request)
+        self.querier.raw_query(bin_request)
     }
 
     /// query is a shorthand for custom_query when we are not using a custom type,

packages/vm/src/testing/querier.rs

@@ -2,7 +2,7 @@ use serde::de::DeserializeOwned;
 
 use cosmwasm_std::testing::{MockQuerier as StdMockQuerier, MockQuerierCustomHandlerResult};
 use cosmwasm_std::{
-    to_binary, to_vec, Binary, Coin, ContractResult, CustomQuery, Empty, HumanAddr, QuerierTrait as _,
+    to_binary, to_vec, Binary, Coin, ContractResult, CustomQuery, Empty, HumanAddr, Querier as _,
     QueryRequest, SystemError, SystemResult,
 };