diff --git a/framework/docs/src/releases/v0.md b/framework/docs/src/releases/v0.md index 7472fff72c..f71349526f 100644 --- a/framework/docs/src/releases/v0.md +++ b/framework/docs/src/releases/v0.md @@ -12,6 +12,7 @@ - Renamed `account_id` to `expected_account_id` for `abstract_client::AccountBuilder` for clarity - Namespace claiming on mainnet is now permissioned. +- Renamed `request` to `execute` in adapter and apps APIs ### Removed diff --git a/framework/packages/abstract-sdk/src/apis/adapter.rs b/framework/packages/abstract-sdk/src/apis/adapter.rs index 4c3739e447..a1cdd4047e 100644 --- a/framework/packages/abstract-sdk/src/apis/adapter.rs +++ b/framework/packages/abstract-sdk/src/apis/adapter.rs @@ -69,8 +69,8 @@ pub struct Adapters<'a, T: AdapterInterface> { impl<'a, T: AdapterInterface> Adapters<'a, T> { /// Interactions with Abstract Adapters - /// Construct an adapter request message. - pub fn request>>( + /// Construct an adapter execute message. + pub fn execute>>( &self, adapter_id: ModuleId, message: M, @@ -134,7 +134,7 @@ mod tests { fail_when_not_dependency_test( |app, deps| { let mods = app.adapters(deps); - mods.request(FAKE_MODULE_ID, MockModuleExecuteMsg {}) + mods.execute(FAKE_MODULE_ID, MockModuleExecuteMsg {}) }, FAKE_MODULE_ID, ); @@ -148,7 +148,7 @@ mod tests { let mods = app.adapters(deps.as_ref()); - let res = mods.request(TEST_MODULE_ID, MockModuleExecuteMsg {}); + let res = mods.execute(TEST_MODULE_ID, MockModuleExecuteMsg {}); let expected_msg: adapter::ExecuteMsg<_, Empty> = adapter::ExecuteMsg::Module(AdapterRequestMsg { diff --git a/framework/packages/abstract-sdk/src/apis/app.rs b/framework/packages/abstract-sdk/src/apis/app.rs index 8f02ca5a9f..2d0b5e2f92 100644 --- a/framework/packages/abstract-sdk/src/apis/app.rs +++ b/framework/packages/abstract-sdk/src/apis/app.rs @@ -69,7 +69,7 @@ pub struct Apps<'a, T: AppInterface> { impl<'a, T: AppInterface> Apps<'a, T> { /// Construct an app request message. - pub fn request( + pub fn execute( &self, app_id: ModuleId, message: impl Into>, @@ -141,7 +141,7 @@ mod tests { fail_when_not_dependency_test( |app, deps| { let mods = app.apps(deps); - mods.request(FAKE_MODULE_ID, MockModuleExecuteMsg {}) + mods.execute(FAKE_MODULE_ID, MockModuleExecuteMsg {}) }, FAKE_MODULE_ID, ); @@ -155,7 +155,7 @@ mod tests { let mods = app.apps(deps.as_ref()); - let res = mods.request(TEST_MODULE_ID, MockModuleExecuteMsg {}); + let res = mods.execute(TEST_MODULE_ID, MockModuleExecuteMsg {}); let expected_msg: app::ExecuteMsg<_, Empty> = app::ExecuteMsg::Module(MockModuleExecuteMsg {}); diff --git a/modules/contracts/adapters/dex/src/api.rs b/modules/contracts/adapters/dex/src/api.rs index 9f97c30ae4..ce0ac46a18 100644 --- a/modules/contracts/adapters/dex/src/api.rs +++ b/modules/contracts/adapters/dex/src/api.rs @@ -79,10 +79,10 @@ pub mod raw { } /// Executes a [DexRawAction] in th DEX - fn request(&self, action: DexRawAction) -> AbstractSdkResult { + fn execute(&self, action: DexRawAction) -> AbstractSdkResult { let adapters = self.base.adapters(self.deps); - adapters.request( + adapters.execute( self.dex_module_id(), DexExecuteMsg::RawAction { dex: self.dex_name(), @@ -100,7 +100,7 @@ pub mod raw { belief_price: Option, pool: PoolAddress, ) -> AbstractSdkResult { - self.request(DexRawAction::Swap { + self.execute(DexRawAction::Swap { offer_asset: offer_asset.into(), ask_asset: ask_asset.into(), belief_price, @@ -116,7 +116,7 @@ pub mod raw { max_spread: Option, pool: PoolAddress, ) -> AbstractSdkResult { - self.request(DexRawAction::ProvideLiquidity { + self.execute(DexRawAction::ProvideLiquidity { assets: assets.into_iter().map(Into::into).collect(), pool: pool.into(), max_spread, @@ -130,7 +130,7 @@ pub mod raw { paired_assets: Vec, pool: PoolAddress, ) -> AbstractSdkResult { - self.request(DexRawAction::ProvideLiquiditySymmetric { + self.execute(DexRawAction::ProvideLiquiditySymmetric { offer_asset: offer_asset.into(), paired_assets: paired_assets.into_iter().map(Into::into).collect(), pool: pool.into(), @@ -143,7 +143,7 @@ pub mod raw { lp_token: Asset, pool: PoolAddress, ) -> AbstractSdkResult { - self.request(DexRawAction::WithdrawLiquidity { + self.execute(DexRawAction::WithdrawLiquidity { lp_token: lp_token.into(), pool: pool.into(), }) @@ -240,10 +240,10 @@ pub mod ans { } /// Executes a [DexAction] in th DEX - fn request(&self, action: DexAnsAction) -> AbstractSdkResult { + fn execute(&self, action: DexAnsAction) -> AbstractSdkResult { let adapters = self.base.adapters(self.deps); - adapters.request( + adapters.execute( self.dex_module_id(), DexExecuteMsg::AnsAction { dex: self.dex_name(), @@ -260,7 +260,7 @@ pub mod ans { max_spread: Option, belief_price: Option, ) -> AbstractSdkResult { - self.request(DexAnsAction::Swap { + self.execute(DexAnsAction::Swap { offer_asset, ask_asset, belief_price, @@ -274,7 +274,7 @@ pub mod ans { assets: Vec, max_spread: Option, ) -> AbstractSdkResult { - self.request(DexAnsAction::ProvideLiquidity { assets, max_spread }) + self.execute(DexAnsAction::ProvideLiquidity { assets, max_spread }) } /// Provide symmetrict liquidity in the DEX @@ -283,7 +283,7 @@ pub mod ans { offer_asset: AnsAsset, paired_assets: Vec, ) -> AbstractSdkResult { - self.request(DexAnsAction::ProvideLiquiditySymmetric { + self.execute(DexAnsAction::ProvideLiquiditySymmetric { offer_asset, paired_assets, }) @@ -291,7 +291,7 @@ pub mod ans { /// Withdraw liquidity from the DEX pub fn withdraw_liquidity(&self, lp_token: AnsAsset) -> AbstractSdkResult { - self.request(DexAnsAction::WithdrawLiquidity { lp_token }) + self.execute(DexAnsAction::WithdrawLiquidity { lp_token }) } } diff --git a/modules/contracts/adapters/money-market/src/api.rs b/modules/contracts/adapters/money-market/src/api.rs index 4f52ee7586..36b57cd932 100644 --- a/modules/contracts/adapters/money-market/src/api.rs +++ b/modules/contracts/adapters/money-market/src/api.rs @@ -86,10 +86,10 @@ pub mod raw { } /// Executes a [MoneyMarketRawAction] in th MONEY_MARKET - fn request(&self, action: MoneyMarketRawAction) -> AbstractSdkResult { + fn execute(&self, action: MoneyMarketRawAction) -> AbstractSdkResult { let adapters = self.base.adapters(self.deps); - adapters.request( + adapters.execute( self.money_market_module_id(), MoneyMarketExecuteMsg::RawAction { money_market: self.money_market_name(), @@ -104,7 +104,7 @@ pub mod raw { contract_addr: Addr, lending_asset: Asset, ) -> AbstractSdkResult { - self.request(MoneyMarketRawAction { + self.execute(MoneyMarketRawAction { contract_addr: contract_addr.to_string(), request: MoneyMarketRawRequest::Deposit { lending_asset: lending_asset.into(), @@ -118,7 +118,7 @@ pub mod raw { contract_addr: Addr, lent_asset: Asset, ) -> AbstractSdkResult { - self.request(MoneyMarketRawAction { + self.execute(MoneyMarketRawAction { contract_addr: contract_addr.to_string(), request: MoneyMarketRawRequest::Withdraw { lent_asset: lent_asset.into(), @@ -133,7 +133,7 @@ pub mod raw { collateral_asset: Asset, borrowable_asset: AssetInfo, ) -> AbstractSdkResult { - self.request(MoneyMarketRawAction { + self.execute(MoneyMarketRawAction { contract_addr: contract_addr.to_string(), request: MoneyMarketRawRequest::ProvideCollateral { collateral_asset: collateral_asset.into(), @@ -149,7 +149,7 @@ pub mod raw { collateral_asset: Asset, borrowable_asset: AssetInfo, ) -> AbstractSdkResult { - self.request(MoneyMarketRawAction { + self.execute(MoneyMarketRawAction { contract_addr: contract_addr.to_string(), request: MoneyMarketRawRequest::WithdrawCollateral { collateral_asset: collateral_asset.into(), @@ -165,7 +165,7 @@ pub mod raw { collateral_asset: AssetInfo, borrow_asset: Asset, ) -> AbstractSdkResult { - self.request(MoneyMarketRawAction { + self.execute(MoneyMarketRawAction { contract_addr: contract_addr.to_string(), request: MoneyMarketRawRequest::Borrow { collateral_asset: collateral_asset.into(), @@ -181,7 +181,7 @@ pub mod raw { collateral_asset: AssetInfo, borrowed_asset: Asset, ) -> AbstractSdkResult { - self.request(MoneyMarketRawAction { + self.execute(MoneyMarketRawAction { contract_addr: contract_addr.to_string(), request: MoneyMarketRawRequest::Repay { collateral_asset: collateral_asset.into(), @@ -325,10 +325,10 @@ pub mod ans { } /// Executes a [MoneyMarketAction] in th MONEY_MARKET - fn request(&self, action: MoneyMarketAnsAction) -> AbstractSdkResult { + fn execute(&self, action: MoneyMarketAnsAction) -> AbstractSdkResult { let adapters = self.base.adapters(self.deps); - adapters.request( + adapters.execute( self.money_market_module_id(), MoneyMarketExecuteMsg::AnsAction { money_market: self.money_market_name(), @@ -339,12 +339,12 @@ pub mod ans { /// Deposit assets pub fn deposit(&self, lending_asset: AnsAsset) -> AbstractSdkResult { - self.request(MoneyMarketAnsAction::Deposit { lending_asset }) + self.execute(MoneyMarketAnsAction::Deposit { lending_asset }) } /// Withdraw liquidity from MONEY_MARKET pub fn withdraw(&self, lent_asset: AnsAsset) -> AbstractSdkResult { - self.request(MoneyMarketAnsAction::Withdraw { lent_asset }) + self.execute(MoneyMarketAnsAction::Withdraw { lent_asset }) } /// Deposit Collateral in MONEY_MARKET @@ -353,7 +353,7 @@ pub mod ans { collateral_asset: AnsAsset, borrowable_asset: AssetEntry, ) -> AbstractSdkResult { - self.request(MoneyMarketAnsAction::ProvideCollateral { + self.execute(MoneyMarketAnsAction::ProvideCollateral { collateral_asset, borrowable_asset, }) @@ -365,7 +365,7 @@ pub mod ans { collateral_asset: AnsAsset, borrowable_asset: AssetEntry, ) -> AbstractSdkResult { - self.request(MoneyMarketAnsAction::WithdrawCollateral { + self.execute(MoneyMarketAnsAction::WithdrawCollateral { collateral_asset, borrowable_asset, }) @@ -377,7 +377,7 @@ pub mod ans { collateral_asset: AssetEntry, borrow_asset: AnsAsset, ) -> AbstractSdkResult { - self.request(MoneyMarketAnsAction::Borrow { + self.execute(MoneyMarketAnsAction::Borrow { collateral_asset, borrow_asset, }) @@ -389,7 +389,7 @@ pub mod ans { collateral_asset: AssetEntry, borrowed_asset: AnsAsset, ) -> AbstractSdkResult { - self.request(MoneyMarketAnsAction::Repay { + self.execute(MoneyMarketAnsAction::Repay { collateral_asset, borrowed_asset, }) diff --git a/modules/contracts/apps/croncat/src/api.rs b/modules/contracts/apps/croncat/src/api.rs index cfcf88f4ae..e22fd5527b 100644 --- a/modules/contracts/apps/croncat/src/api.rs +++ b/modules/contracts/apps/croncat/src/api.rs @@ -54,7 +54,7 @@ impl<'a, T: CronCatInterface> CronCat<'a, T> { task_tag: impl Into, assets: AssetListUnchecked, ) -> AbstractSdkResult { - self.base.apps(self.deps).request( + self.base.apps(self.deps).execute( self.module_id, AppExecuteMsg::CreateTask { task: Box::new(task), @@ -70,7 +70,7 @@ impl<'a, T: CronCatInterface> CronCat<'a, T> { task_tag: impl Into, assets: AssetListUnchecked, ) -> AbstractSdkResult { - self.base.apps(self.deps).request( + self.base.apps(self.deps).execute( self.module_id, AppExecuteMsg::RefillTask { task_tag: task_tag.into(), @@ -81,7 +81,7 @@ impl<'a, T: CronCatInterface> CronCat<'a, T> { // Remove task by tag pub fn remove_task(&self, task_tag: impl Into) -> AbstractSdkResult { - self.base.apps(self.deps).request( + self.base.apps(self.deps).execute( self.module_id, AppExecuteMsg::RemoveTask { task_tag: task_tag.into(), @@ -93,7 +93,7 @@ impl<'a, T: CronCatInterface> CronCat<'a, T> { pub fn purge(&self, task_tags: Vec) -> AbstractSdkResult { self.base .apps(self.deps) - .request(self.module_id, AppExecuteMsg::Purge { task_tags }) + .execute(self.module_id, AppExecuteMsg::Purge { task_tags }) } }