started removing msg files

securesecrets · Mar 12, 2024 · fb9d478 · fb9d478
1 parent d2a4bee
commit fb9d478
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 234 deletions.
diff --git a/contracts/lending/credit-agency/Cargo.toml b/contracts/lending/credit-agency/Cargo.toml
@@ -21,6 +21,8 @@ shade-protocol = { version = "0.1.0", path = "../../../packages/shade_protocol",
   "snip20",
   "storage_plus",
   "lending_utils",
+  "credit_agency",
+  "lend_market",
 ] }
 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }

diff --git a/contracts/lending/credit-agency/src/bin/credit_agency_schema.rs b/contracts/lending/credit-agency/src/bin/credit_agency_schema.rs
@@ -1,10 +1,12 @@
 use cosmwasm_schema::write_api;
-use credit_agency::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use shade_protocol::credit_agency::{ExecuteMsg, InstantiateMsg, QueryMsg};
 
 fn main() {
+    /*
     write_api! {
         instantiate: InstantiateMsg,
         execute: ExecuteMsg,
         query: QueryMsg,
     }
+    */
 }
diff --git a/contracts/lending/credit-agency/src/contract.rs b/contracts/lending/credit-agency/src/contract.rs
@@ -4,22 +4,22 @@ use shade_protocol::{
         from_binary, shd_entry_point, to_binary, Addr, Binary, Decimal, Deps, DepsMut, Env,
         MessageInfo, Reply, Response, StdError, StdResult, SubMsgResult,
     },
-    contract_interfaces::snip20::{ExecuteMsg as Snip20ExecuteMsg, Snip20ReceiveMsg},
+    contract_interfaces::{
+        credit_agency::{ExecuteMsg, InstantiateMsg, QueryMsg, ReceiveMsg, UserDataResponse},
+        snip20::{ExecuteMsg as Snip20ExecuteMsg, Snip20ReceiveMsg},
+    },
     lending_utils::{token::Token, Authentication, ViewingKey},
     utils::{asset::Contract, InstantiateCallback, Query},
 };
 
 use crate::{
     error::ContractError,
-    msg::{ExecuteMsg, InstantiateMsg, QueryMsg, ReceiveMsg, UserDataResponse},
     state::{
         find_value, insert_or_update, Config, MarketState, CONFIG, INIT_MARKET, MARKETS,
         MARKET_VIEWING_KEY,
     },
 };
 
-use serde_json::json;
-
 const INIT_MARKET_REPLY_ID: u64 = 1;
 
 #[cfg_attr(not(feature = "library"), shd_entry_point)]
@@ -165,19 +165,18 @@ mod execute {
         credit_line::{CreditLineResponse, CreditLineValues},
         price::{coin_times_price_rate, PriceRate},
     };
-
-    use crate::{
-        msg::{MarketConfig, ReceiveMsg},
-        state::{MarketState, ENTERED_MARKETS, INIT_MARKET},
-    };
-    use lend_market::{
-        msg::{
+    use shade_protocol::{
+        credit_agency::{MarketConfig, ReceiveMsg},
+        lend_market::{
             ExecuteMsg as MarketExecuteMsg, InstantiateMsg as MarketInstantiateMsg,
-            QueryMsg as MarketQueryMsg,
+            QueryMsg as MarketQueryMsg, ReceiveMsg as MarketReceiveMsg,
         },
-        state::Config as MarketConfiguration,
+        utils::{InstantiateCallback, Query},
     };
 
+    use crate::state::{MarketState, ENTERED_MARKETS, INIT_MARKET};
+    use lend_market::state::Config as MarketConfiguration;
+
     pub fn create_market(
         deps: DepsMut,
         env: Env,
@@ -262,7 +261,7 @@ mod execute {
             .add_attribute("action", "create_market")
             .add_attribute("sender", info.sender)
             .add_message(market_init))
-            // .add_submessage(SubMsg::reply_on_success(market_init, INIT_MARKET_REPLY_ID)))
+        // .add_submessage(SubMsg::reply_on_success(market_init, INIT_MARKET_REPLY_ID)))
     }
 
     pub fn enter_market(
@@ -383,7 +382,7 @@ mod execute {
     ) -> StdResult<SubMsg> {
         match coin.denom {
             Token::Cw20(contract_info) => {
-                let repay_to_msg: Binary = to_binary(&lend_market::msg::ReceiveMsg::RepayTo {
+                let repay_to_msg: Binary = to_binary(&MarketReceiveMsg::RepayTo {
                     account: account.to_string(),
                 })?;
 
@@ -449,7 +448,7 @@ mod execute {
         let collateral_market = query::market(deps.as_ref(), &collateral_denom)?.market;
 
         // transfer claimed amount as reward
-        let msg = to_binary(&lend_market::msg::ExecuteMsg::TransferFrom {
+        let msg = to_binary(&MarketExecuteMsg::TransferFrom {
             source: account.clone(),
             destination: sender.clone(),
             // transfer repaid amount represented as amount of common tokens, which is
@@ -513,21 +512,21 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<Binary, ContractErr
 mod query {
     use shade_protocol::c_std::StdResult;
 
-    use lend_market::msg::{QueryMsg as MarketQueryMsg, TokensBalanceResponse};
     use shade_protocol::lending_utils::{
         coin::Coin,
         credit_line::{CreditLineResponse, CreditLineValues},
         Authentication,
     };
-
-    use crate::{
-        msg::{
+    use shade_protocol::{
+        credit_agency::{
             IsOnMarketResponse, LiquidationResponse, ListEnteredMarketsResponse,
             ListMarketsResponse, MarketResponse,
         },
-        state::{ENTERED_MARKETS, MARKETS},
+        lend_market::{QueryMsg as MarketQueryMsg, TokensBalanceResponse},
     };
 
+    use crate::state::{ENTERED_MARKETS, MARKETS};
+
     use super::*;
 
     /// Returns the address of the market associated to the given `market_token`. Returns an error
@@ -725,18 +724,17 @@ mod query {
                 .iter()
                 .map(|market| {
                     let market = market.clone();
-                    let balance_response: lend_market::msg::TokensBalanceResponse =
-                        deps.querier.query_wasm_smart(
-                            market.code_hash.clone(),
-                            market.address.to_string(),
-                            &MarketQueryMsg::TokensBalance {
-                                account: deps.api.addr_validate(&account)?,
-                                authentication: authentication.clone(),
-                            },
-                        )?;
+                    let balance_response: TokensBalanceResponse = deps.querier.query_wasm_smart(
+                        market.code_hash.clone(),
+                        market.address.to_string(),
+                        &MarketQueryMsg::TokensBalance {
+                            account: deps.api.addr_validate(&account)?,
+                            authentication: authentication.clone(),
+                        },
+                    )?;
                     Ok((market.clone(), balance_response))
                 })
-                .collect::<StdResult<Vec<(Contract, lend_market::msg::TokensBalanceResponse)>>>()?
+                .collect::<StdResult<Vec<(Contract, TokensBalanceResponse)>>>()?
         } else {
             vec![]
         };

diff --git a/contracts/lending/credit-agency/src/lib.rs b/contracts/lending/credit-agency/src/lib.rs
@@ -1,4 +1,3 @@
 pub mod contract;
 pub mod error;
-pub mod msg;
 pub mod state;
diff --git a/contracts/lending/credit-agency/src/msg.rs b/contracts/lending/credit-agency/src/msg.rs
diff --git a/contracts/lending/market_v2/src/bin/market_schema.rs b/contracts/lending/market_v2/src/bin/market_schema.rs
@@ -2,9 +2,11 @@ use cosmwasm_schema::write_api;
 use lend_market::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
 
 fn main() {
+    /*
     write_api! {
         instantiate: InstantiateMsg,
         execute: ExecuteMsg,
         query: QueryMsg,
     }
+    */
 }