Fix entry points and bump deps (#331)

* Bump deps. * Fix entry points for migration.
mars-protocol · Oct 4, 2023 · 4bc2838 · 4bc2838
1 parent 7a1a6d8
commit 4bc2838
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -60,9 +60,9 @@ strum             = "0.25.0"
 thiserror         = "1.0.48"
 
 # dev-dependencies
-cw-multi-test     = "0.16.5"
+cw-multi-test     = "0.17.0"
 cw-it             = "0.2.1"
-osmosis-test-tube = "19.0.0"
+osmosis-test-tube = "19.2.0"
 proptest          = "1.2.0"
 test-case         = "3.2.1"
 

diff --git a/contracts/address-provider/src/contract.rs b/contracts/address-provider/src/contract.rs
@@ -166,7 +166,7 @@ fn query_all_addresses(
         .collect()
 }
 
-#[entry_point]
+#[cfg_attr(not(feature = "library"), entry_point)]
 pub fn migrate(deps: DepsMut, _env: Env, _msg: Empty) -> Result<Response, ContractError> {
     migrations::v2_0_0::migrate(deps)
 }
diff --git a/contracts/red-bank/src/contract.rs b/contracts/red-bank/src/contract.rs
@@ -11,7 +11,7 @@ use crate::{
 pub const CONTRACT_NAME: &str = env!("CARGO_PKG_NAME");
 pub const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
 
-#[entry_point]
+#[cfg_attr(not(feature = "library"), entry_point)]
 pub fn instantiate(
     deps: DepsMut,
     _env: Env,
@@ -21,7 +21,7 @@ pub fn instantiate(
     instantiate::instantiate(deps, msg)
 }
 
-#[entry_point]
+#[cfg_attr(not(feature = "library"), entry_point)]
 pub fn execute(
     deps: DepsMut,
     env: Env,
@@ -137,7 +137,7 @@ pub fn execute(
     }
 }
 
-#[entry_point]
+#[cfg_attr(not(feature = "library"), entry_point)]
 pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<Binary, ContractError> {
     let res = match msg {
         QueryMsg::Config {} => to_binary(&query::query_config(deps)?),
@@ -259,7 +259,7 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<Binary, ContractErro
     res.map_err(Into::into)
 }
 
-#[entry_point]
+#[cfg_attr(not(feature = "library"), entry_point)]
 pub fn migrate(deps: DepsMut, _env: Env, _msg: Empty) -> Result<Response, ContractError> {
     migrations::v2_0_0::migrate(deps)
 }
diff --git a/contracts/swapper/osmosis/src/contract.rs b/contracts/swapper/osmosis/src/contract.rs
@@ -37,7 +37,7 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> ContractResult<Binary> {
     OsmosisSwap::default().query(deps, env, msg)
 }
 
-#[entry_point]
+#[cfg_attr(not(feature = "library"), entry_point)]
 pub fn migrate(deps: DepsMut, _env: Env, _msg: Empty) -> Result<Response, ContractError> {
     migrations::v2_0_0::migrate(deps)
 }