chore: add the config query back

osmosis-cw-pool/src/commands.rs

@@ -26,6 +26,8 @@ pub(crate) fn swap_exact_amount_in(
     token_out_denom: String,
     minimum_receive: Uint128,
 ) -> Result<Response, ContractError> {
+    ensure_is_active(&deps)?;
+
     let config = CONFIG.load(deps.storage)?;
     let sender = deps.api.addr_validate(sender.as_str())?;
 
@@ -68,6 +70,8 @@ pub(crate) fn swap_exact_amount_out(
     token_in_max_amount: Uint128,
     token_in_denom: String,
 ) -> Result<Response, ContractError> {
+    ensure_is_active(&deps)?;
+
     let config = CONFIG.load(deps.storage)?;
     let sender = deps.api.addr_validate(sender.as_str())?;
 
@@ -180,3 +184,12 @@ fn get_paired_asset_info(
 
     Ok(asset_info)
 }
+
+/// Asserts that the pool is active.
+fn ensure_is_active(deps: &DepsMut) -> Result<(), ContractError> {
+    let is_active = IS_ACTIVE.load(deps.storage)?;
+    if !is_active {
+        return Err(ContractError::InactivePool);
+    }
+    Ok(())
+}

osmosis-cw-pool/src/contract.rs

@@ -146,6 +146,7 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
             token_out,
             token_in_denom,
         )?)?),
+        QueryMsg::GetConfig {} => Ok(to_json_binary(&queries::get_config(deps)?)?),
     }
 }
 

osmosis-cw-pool/src/error.rs

@@ -50,6 +50,9 @@ pub enum ContractError {
 
     #[error("Can't swap zero amount")]
     ZeroAmount,
+
+    #[error("The pool is currently inactive")]
+    InactivePool,
 }
 
 impl From<semver::Error> for ContractError {

osmosis-cw-pool/src/msg.rs

@@ -85,6 +85,10 @@ pub enum QueryMsg {
         token_in_denom: String,
         swap_fee: Decimal,
     },
+
+    /// Returns the config of the contract
+    #[returns(Config)]
+    GetConfig {},
 }
 
 #[cw_serde]

osmosis-cw-pool/src/queries.rs

@@ -7,8 +7,8 @@ use white_whale_std::pool_network::pair::{
 };
 
 use crate::msg::{
-    CalcInAmtGivenOutResponse, CalcOutAmtGivenInResponse, GetSwapFeeResponse, IsActiveResponse,
-    SpotPriceResponse, TotalPoolLiquidityResponse,
+    CalcInAmtGivenOutResponse, CalcOutAmtGivenInResponse, Config, GetSwapFeeResponse,
+    IsActiveResponse, SpotPriceResponse, TotalPoolLiquidityResponse,
 };
 use crate::state::{CONFIG, IS_ACTIVE};
 
@@ -68,6 +68,11 @@ pub(crate) fn get_total_pool_liquidity(deps: Deps) -> StdResult<TotalPoolLiquidi
     })
 }
 
+/// Queries the config of the contract
+pub(crate) fn get_config(deps: Deps) -> StdResult<Config> {
+    CONFIG.load(deps.storage)
+}
+
 /// Queries the spot price
 pub(crate) fn spot_price(
     deps: Deps,

osmosis-cw-pool/tests/integration.rs

@@ -8,7 +8,7 @@ use white_whale_std::pool_network::asset::{Asset, AssetInfo};
 use white_whale_std::pool_network::pair::{PoolFee, PoolResponse};
 
 use osmosis_cw_pool::msg::{
-    CalcInAmtGivenOutResponse, CalcOutAmtGivenInResponse, GetSwapFeeResponse,
+    CalcInAmtGivenOutResponse, CalcOutAmtGivenInResponse, Config, GetSwapFeeResponse,
     IsActiveResponse, QueryMsg, SpotPriceResponse, TotalPoolLiquidityResponse,
 };
 
@@ -607,5 +607,17 @@ fn check_queries() {
                 let res = result.unwrap();
                 assert_eq!(res, IsActiveResponse { is_active: false });
             },
+        )
+        .query_osmosis_pool_interface(
+            QueryMsg::GetConfig {},
+            |result: Result<Config, RunnerError>| {
+                let res = result.unwrap();
+                assert_eq!(
+                    res,
+                    Config {
+                        white_whale_pool: ww_pool.clone()
+                    }
+                );
+            },
         );
 }