Generalized querier getter (#318)

* show POC of generalized querier getter

* update

* fix merge and impl for all envs

* Doon't verify mockj error anymore

* Fixed test

* update `QueryHandler` and WasmQuerier functions

* fix smart query URL

* fix compile

* format and clippy

---------

Co-authored-by: Kayanski <kowalski.kowalskin@gmail.com>

Author: CyberHoward

cw-orch-daemon/src/queriers.rs

@@ -47,18 +47,19 @@ macro_rules! cosmos_query {
 mod authz;
 mod bank;
 mod cosmwasm;
+mod env;
 mod feegrant;
 mod gov;
 mod ibc;
 mod node;
 mod staking;
 
 pub use authz::Authz;
-pub use bank::{cosmrs_to_cosmwasm_coins, Bank};
-pub use cosmwasm::CosmWasm;
+pub use bank::{cosmrs_to_cosmwasm_coins, Bank, DaemonBankQuerier};
+pub use cosmwasm::{CosmWasm, DaemonWasmQuerier};
 pub use feegrant::Feegrant;
 pub use ibc::Ibc;
-pub use node::Node;
+pub use node::{DaemonNodeQuerier, Node};
 
 // this two containt structs that are helpers for the queries
 pub use gov::*;

cw-orch-daemon/src/queriers/bank.rs

@@ -1,7 +1,7 @@
 use crate::{cosmos_modules, error::DaemonError, Daemon};
 use cosmrs::proto::cosmos::base::{query::v1beta1::PageRequest, v1beta1::Coin};
 use cosmwasm_std::StdError;
-use cw_orch_core::environment::queriers::bank::{BankQuerier, BankQuerierGetter};
+use cw_orch_core::environment::{BankQuerier, Querier, QuerierGetter};
 use tokio::runtime::Handle;
 use tonic::transport::Channel;
 
@@ -157,17 +157,17 @@ impl DaemonBankQuerier {
     }
 }
 
-impl BankQuerierGetter<DaemonError> for Daemon {
-    type Querier = DaemonBankQuerier;
+impl Querier for DaemonBankQuerier {
+    type Error = DaemonError;
+}
 
-    fn bank_querier(&self) -> Self::Querier {
+impl QuerierGetter<DaemonBankQuerier> for Daemon {
+    fn querier(&self) -> DaemonBankQuerier {
         DaemonBankQuerier::new(self)
     }
 }
 
 impl BankQuerier for DaemonBankQuerier {
-    type Error = DaemonError;
-
     fn balance(
         &self,
         address: impl Into<String>,

cw-orch-daemon/src/queriers/cosmwasm.rs

@@ -1,7 +1,7 @@
 use crate::{cosmos_modules, error::DaemonError, Daemon};
 use cosmrs::proto::cosmos::base::query::v1beta1::PageRequest;
 use cosmwasm_std::{from_json, to_json_binary, CodeInfoResponse, ContractInfoResponse};
-use cw_orch_core::environment::queriers::wasm::{WasmQuerier, WasmQuerierGetter};
+use cw_orch_core::environment::{Querier, QuerierGetter, WasmQuerier};
 use tokio::runtime::Handle;
 use tonic::transport::Channel;
 
@@ -187,17 +187,17 @@ impl DaemonWasmQuerier {
     }
 }
 
-impl WasmQuerierGetter<DaemonError> for Daemon {
-    type Querier = DaemonWasmQuerier;
-
-    fn wasm_querier(&self) -> Self::Querier {
+impl QuerierGetter<DaemonWasmQuerier> for Daemon {
+    fn querier(&self) -> DaemonWasmQuerier {
         DaemonWasmQuerier::new(self)
     }
 }
 
-impl WasmQuerier for DaemonWasmQuerier {
+impl Querier for DaemonWasmQuerier {
     type Error = DaemonError;
+}
 
+impl WasmQuerier for DaemonWasmQuerier {
     fn code_id_hash(&self, code_id: u64) -> Result<String, Self::Error> {
         self.rt_handle
             .block_on(CosmWasm::new(self.channel.clone()).code_id_hash(code_id))
@@ -228,7 +228,7 @@ impl WasmQuerier for DaemonWasmQuerier {
         Ok(c)
     }
 
-    fn contract_raw_state(
+    fn raw_query(
         &self,
         address: impl Into<String>,
         query_data: Vec<u8>,
@@ -240,7 +240,7 @@ impl WasmQuerier for DaemonWasmQuerier {
         Ok(response.data)
     }
 
-    fn contract_smart_state<Q: serde::Serialize, T: serde::de::DeserializeOwned>(
+    fn smart_query<Q: serde::Serialize, T: serde::de::DeserializeOwned>(
         &self,
         address: impl Into<String>,
         query_data: &Q,

cw-orch-daemon/src/queriers/env.rs

@@ -0,0 +1,14 @@
+use cw_orch_core::environment::{EnvironmentInfo, EnvironmentQuerier};
+
+use crate::Daemon;
+
+impl EnvironmentQuerier for Daemon {
+    fn env_info(&self) -> EnvironmentInfo {
+        let state = &self.daemon.sender.daemon_state;
+        EnvironmentInfo {
+            chain_id: state.chain_data.chain_id.to_string(),
+            chain_name: state.chain_data.chain_name.clone(),
+            deployment_id: state.deployment_id.clone(),
+        }
+    }
+}

cw-orch-daemon/src/queriers/node.rs

@@ -11,7 +11,7 @@ use cosmrs::{
 };
 use cosmwasm_std::BlockInfo;
 use cw_orch_core::{
-    environment::queriers::node::{NodeQuerier, NodeQuerierGetter},
+    environment::{NodeQuerier, Querier, QuerierGetter},
     log::query_target,
     CwOrchEnvVars,
 };
@@ -346,17 +346,17 @@ impl DaemonNodeQuerier {
     }
 }
 
-impl NodeQuerierGetter<DaemonError> for Daemon {
-    type Querier = DaemonNodeQuerier;
-
-    fn node_querier(&self) -> Self::Querier {
+impl QuerierGetter<DaemonNodeQuerier> for Daemon {
+    fn querier(&self) -> DaemonNodeQuerier {
         DaemonNodeQuerier::new(self)
     }
 }
 
-impl NodeQuerier for DaemonNodeQuerier {
+impl Querier for DaemonNodeQuerier {
     type Error = DaemonError;
+}
 
+impl NodeQuerier for DaemonNodeQuerier {
     type Response = CosmTxResponse;
 
     fn latest_block(&self) -> Result<cosmwasm_std::BlockInfo, Self::Error> {

cw-orch-daemon/src/sync/core.rs

@@ -2,17 +2,14 @@ use std::{fmt::Debug, sync::Arc, time::Duration};
 
 use super::super::{sender::Wallet, DaemonAsync};
 use crate::{
-    queriers::{DaemonQuerier, Node},
+    queriers::{DaemonBankQuerier, DaemonNodeQuerier, DaemonQuerier, DaemonWasmQuerier, Node},
     CosmTxResponse, DaemonBuilder, DaemonError, DaemonState,
 };
 
-use cosmrs::tendermint::Time;
 use cosmwasm_std::{Addr, Coin};
 use cw_orch_core::{
     contract::{interface_traits::Uploadable, WasmPath},
-    environment::{
-        queriers::QueryHandler, ChainState, EnvironmentInfo, EnvironmentQuerier, TxHandler,
-    },
+    environment::{ChainState, DefaultQueriers, QueryHandler, TxHandler},
 };
 use cw_orch_traits::stargate::Stargate;
 use serde::Serialize;
@@ -218,40 +215,10 @@ impl QueryHandler for Daemon {
         }
         Ok(())
     }
-
-    fn block_info(&self) -> Result<cosmwasm_std::BlockInfo, DaemonError> {
-        let block = self
-            .rt_handle
-            .block_on(self.query_client::<Node>().latest_block())?;
-        let since_epoch = block.header.time.duration_since(Time::unix_epoch())?;
-        let time = cosmwasm_std::Timestamp::from_nanos(since_epoch.as_nanos() as u64);
-        Ok(cosmwasm_std::BlockInfo {
-            height: block.header.height.value(),
-            time,
-            chain_id: block.header.chain_id.to_string(),
-        })
-    }
-
-    fn query<
-        Q: serde::Serialize + std::fmt::Debug,
-        T: serde::Serialize + serde::de::DeserializeOwned,
-    >(
-        &self,
-        query_msg: &Q,
-        contract_address: &cosmwasm_std::Addr,
-    ) -> Result<T, Self::Error> {
-        self.rt_handle
-            .block_on(self.daemon.query(query_msg, contract_address))
-    }
 }
 
-impl EnvironmentQuerier for Daemon {
-    fn env_info(&self) -> EnvironmentInfo {
-        let state = &self.daemon.sender.daemon_state;
-        EnvironmentInfo {
-            chain_id: state.chain_data.chain_id.to_string(),
-            chain_name: state.chain_data.chain_name.clone(),
-            deployment_id: state.deployment_id.clone(),
-        }
-    }
+impl DefaultQueriers for Daemon {
+    type B = DaemonBankQuerier;
+    type W = DaemonWasmQuerier;
+    type N = DaemonNodeQuerier;
 }

cw-orch-daemon/tests/authz.rs

@@ -13,7 +13,7 @@ mod tests {
         bank::v1beta1::MsgSend,
     };
     use cosmwasm_std::coins;
-    use cw_orch_core::environment::{BankQuerier, TxHandler};
+    use cw_orch_core::environment::{BankQuerier, DefaultQueriers, QueryHandler, TxHandler};
     use cw_orch_daemon::{queriers::Authz, Daemon};
     use cw_orch_networks::networks::LOCAL_JUNO;
     use cw_orch_traits::Stargate;
@@ -138,8 +138,9 @@ mod tests {
 
         // the balance of the grantee whould be 6_000_000 or close
 
-        let grantee_balance =
-            daemon.balance(grantee.clone(), Some(LOCAL_JUNO.gas_denom.to_string()))?;
+        let grantee_balance = daemon
+            .bank_querier()
+            .balance(grantee.clone(), Some(LOCAL_JUNO.gas_denom.to_string()))?;
 
         assert_eq!(grantee_balance.first().unwrap().amount.u128(), 6_000_000);
 

cw-orch/examples/complex_osmosis_test_tube.rs

@@ -4,10 +4,7 @@ use counter_contract::{
     CounterContract, CounterExecuteMsgFns, CounterQueryMsgFns,
 };
 
-use cw_orch::prelude::bank::BankQuerier;
-use cw_orch::prelude::bank::BankQuerierGetter;
-use cw_orch::prelude::{CallAs, ContractInstance, OsmosisTestTube};
-use cw_orch::prelude::{CwOrchExecute, CwOrchInstantiate, CwOrchUpload};
+use cw_orch::prelude::*;
 use cw_orch_traits::Stargate;
 use osmosis_std::types::{
     cosmos::base::v1beta1::Coin,

cw-orch/examples/complex_testnet_daemon.rs

@@ -3,12 +3,7 @@ use counter_contract::{
     msg::{ExecuteMsg, GetCountResponse, InstantiateMsg, QueryMsg},
     CounterContract, CounterExecuteMsgFns, CounterQueryMsgFns,
 };
-use cw_orch::prelude::bank::BankQuerier;
-use cw_orch::prelude::bank::BankQuerierGetter;
-use cw_orch::prelude::{
-    ContractInstance, CwOrchExecute, CwOrchInstantiate, CwOrchQuery, CwOrchUpload, Daemon,
-    TxHandler,
-};
+use cw_orch::prelude::*;
 use cw_orch_traits::Stargate;
 use osmosis_std::types::{
     cosmos::base::v1beta1::Coin,

cw-orch/src/osmosis_test_tube/core.rs

@@ -2,8 +2,7 @@ use crate::contract::WasmPath;
 use crate::prelude::Uploadable;
 use cosmwasm_std::Addr;
 
-use cw_orch_core::environment::queriers::bank::{BankQuerier, BankQuerierGetter};
-use cw_orch_core::environment::BankSetter;
+use cw_orch_core::environment::{BankQuerier, BankSetter, DefaultQueriers};
 use cw_orch_traits::stargate::Stargate;
 
 use cosmwasm_std::{Binary, Coin, Uint128};
@@ -33,6 +32,8 @@ use crate::mock::MockState;
 
 pub use osmosis_test_tube;
 
+use super::queriers::bank::OsmosisTestTubeBankQuerier;
+
 /// Wrapper around a osmosis-test-tube [`OsmosisTestApp`](osmosis_test_tube::OsmosisTestApp) backend.
 ///
 /// Stores a local state with a mapping of contract_id -> code_id/address
@@ -269,6 +270,8 @@ impl<S: StateInterface> TxHandler for OsmosisTestTube<S> {
 }
 
 impl BankSetter for OsmosisTestTube {
+    type T = OsmosisTestTubeBankQuerier;
+
     /// It's impossible to set the balance of an address directly in OsmosisTestTub
     /// So for this implementation, we use a weird algorithm
     fn set_balance(
@@ -304,10 +307,7 @@ impl Stargate for OsmosisTestTube {
 pub mod tests {
     use cosmwasm_std::{coins, ContractInfoResponse};
 
-    use cw_orch_core::environment::queriers::{
-        bank::{BankQuerier, BankQuerierGetter},
-        wasm::{WasmQuerier, WasmQuerierGetter},
-    };
+    use cw_orch_core::environment::*;
     use osmosis_test_tube::Account;
 
     use super::OsmosisTestTube;

cw-orch/src/osmosis_test_tube/queriers/bank.rs

@@ -3,8 +3,7 @@ use std::{cell::RefCell, rc::Rc};
 use cosmwasm_std::coin;
 use cw_orch_core::{
     environment::{
-        queriers::bank::{BankQuerier, BankQuerierGetter},
-        StateInterface, TxHandler,
+        Querier, StateInterface, {BankQuerier, QuerierGetter},
     },
     CwEnvError,
 };
@@ -16,29 +15,29 @@ use crate::osmosis_test_tube::{map_err, OsmosisTestTube};
 use osmosis_test_tube::osmosis_std::types::cosmos::bank::v1beta1::{
     QueryAllBalancesRequest, QueryBalanceRequest,
 };
-pub struct MockBankQuerier {
+pub struct OsmosisTestTubeBankQuerier {
     app: Rc<RefCell<OsmosisTestApp>>,
 }
 
-impl MockBankQuerier {
+impl OsmosisTestTubeBankQuerier {
     fn new<S: StateInterface>(mock: &OsmosisTestTube<S>) -> Self {
         Self {
             app: mock.app.clone(),
         }
     }
 }
 
-impl<S: StateInterface> BankQuerierGetter<<Self as TxHandler>::Error> for OsmosisTestTube<S> {
-    type Querier = MockBankQuerier;
+impl Querier for OsmosisTestTubeBankQuerier {
+    type Error = CwEnvError;
+}
 
-    fn bank_querier(&self) -> Self::Querier {
-        MockBankQuerier::new(self)
+impl<S: StateInterface> QuerierGetter<OsmosisTestTubeBankQuerier> for OsmosisTestTube<S> {
+    fn querier(&self) -> OsmosisTestTubeBankQuerier {
+        OsmosisTestTubeBankQuerier::new(self)
     }
 }
 
-impl BankQuerier for MockBankQuerier {
-    type Error = CwEnvError;
-
+impl BankQuerier for OsmosisTestTubeBankQuerier {
     fn balance(
         &self,
         address: impl Into<String>,

cw-orch/src/osmosis_test_tube/queriers/env.rs

@@ -1,7 +1,10 @@
-use crate::osmosis_test_tube::OsmosisTestTube;
-use cw_orch_core::environment::{EnvironmentInfo, EnvironmentQuerier, QueryHandler};
+use cw_orch_core::environment::{
+    EnvironmentInfo, EnvironmentQuerier, QueryHandler, StateInterface,
+};
 
-impl EnvironmentQuerier for OsmosisTestTube {
+use crate::prelude::OsmosisTestTube;
+
+impl<S: StateInterface> EnvironmentQuerier for OsmosisTestTube<S> {
     fn env_info(&self) -> EnvironmentInfo {
         let block = self.block_info().unwrap();
         let chain_id = block.chain_id;