Skip to content

Commit 025a52b

Browse files
KayanskiKayanski
authored
ABS-384 : Rename adapter and app apis request fn to execute (#328)
* Renamed request to execute in adapters and apps * Another request renameé * Update changelog
1 parent 5298ce1 commit 025a52b

File tree

6 files changed

+40
-39
lines changed

6 files changed

+40
-39
lines changed

‎framework/docs/src/releases/v0.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
- Renamed `account_id` to `expected_account_id` for `abstract_client::AccountBuilder` for clarity
1414
- Namespace claiming on mainnet is now permissioned.
15+
- Renamed `request` to `execute` in adapter and apps APIs
1516

1617
### Removed
1718

‎framework/packages/abstract-sdk/src/apis/adapter.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ pub struct Adapters<'a, T: AdapterInterface> {
6969

7070
impl<'a, T: AdapterInterface> Adapters<'a, T> {
7171
/// Interactions with Abstract Adapters
72-
/// Construct an adapter request message.
73-
pub fn request<M: Serialize + Into<abstract_std::adapter::ExecuteMsg<M, Empty>>>(
72+
/// Construct an adapter execute message.
73+
pub fn execute<M: Serialize + Into<abstract_std::adapter::ExecuteMsg<M, Empty>>>(
7474
&self,
7575
adapter_id: ModuleId,
7676
message: M,
@@ -134,7 +134,7 @@ mod tests {
134134
fail_when_not_dependency_test(
135135
|app, deps| {
136136
let mods = app.adapters(deps);
137-
mods.request(FAKE_MODULE_ID, MockModuleExecuteMsg {})
137+
mods.execute(FAKE_MODULE_ID, MockModuleExecuteMsg {})
138138
},
139139
FAKE_MODULE_ID,
140140
);
@@ -148,7 +148,7 @@ mod tests {
148148

149149
let mods = app.adapters(deps.as_ref());
150150

151-
let res = mods.request(TEST_MODULE_ID, MockModuleExecuteMsg {});
151+
let res = mods.execute(TEST_MODULE_ID, MockModuleExecuteMsg {});
152152

153153
let expected_msg: adapter::ExecuteMsg<_, Empty> =
154154
adapter::ExecuteMsg::Module(AdapterRequestMsg {

‎framework/packages/abstract-sdk/src/apis/app.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ pub struct Apps<'a, T: AppInterface> {
6969

7070
impl<'a, T: AppInterface> Apps<'a, T> {
7171
/// Construct an app request message.
72-
pub fn request<M: Serialize>(
72+
pub fn execute<M: Serialize>(
7373
&self,
7474
app_id: ModuleId,
7575
message: impl Into<msg::ExecuteMsg<M, Empty>>,
@@ -141,7 +141,7 @@ mod tests {
141141
fail_when_not_dependency_test(
142142
|app, deps| {
143143
let mods = app.apps(deps);
144-
mods.request(FAKE_MODULE_ID, MockModuleExecuteMsg {})
144+
mods.execute(FAKE_MODULE_ID, MockModuleExecuteMsg {})
145145
},
146146
FAKE_MODULE_ID,
147147
);
@@ -155,7 +155,7 @@ mod tests {
155155

156156
let mods = app.apps(deps.as_ref());
157157

158-
let res = mods.request(TEST_MODULE_ID, MockModuleExecuteMsg {});
158+
let res = mods.execute(TEST_MODULE_ID, MockModuleExecuteMsg {});
159159

160160
let expected_msg: app::ExecuteMsg<_, Empty> =
161161
app::ExecuteMsg::Module(MockModuleExecuteMsg {});

‎modules/contracts/adapters/dex/src/api.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ pub mod raw {
7979
}
8080

8181
/// Executes a [DexRawAction] in th DEX
82-
fn request(&self, action: DexRawAction) -> AbstractSdkResult<CosmosMsg> {
82+
fn execute(&self, action: DexRawAction) -> AbstractSdkResult<CosmosMsg> {
8383
let adapters = self.base.adapters(self.deps);
8484

85-
adapters.request(
85+
adapters.execute(
8686
self.dex_module_id(),
8787
DexExecuteMsg::RawAction {
8888
dex: self.dex_name(),
@@ -100,7 +100,7 @@ pub mod raw {
100100
belief_price: Option<Decimal>,
101101
pool: PoolAddress,
102102
) -> AbstractSdkResult<CosmosMsg> {
103-
self.request(DexRawAction::Swap {
103+
self.execute(DexRawAction::Swap {
104104
offer_asset: offer_asset.into(),
105105
ask_asset: ask_asset.into(),
106106
belief_price,
@@ -116,7 +116,7 @@ pub mod raw {
116116
max_spread: Option<Decimal>,
117117
pool: PoolAddress,
118118
) -> AbstractSdkResult<CosmosMsg> {
119-
self.request(DexRawAction::ProvideLiquidity {
119+
self.execute(DexRawAction::ProvideLiquidity {
120120
assets: assets.into_iter().map(Into::into).collect(),
121121
pool: pool.into(),
122122
max_spread,
@@ -130,7 +130,7 @@ pub mod raw {
130130
paired_assets: Vec<AssetInfo>,
131131
pool: PoolAddress,
132132
) -> AbstractSdkResult<CosmosMsg> {
133-
self.request(DexRawAction::ProvideLiquiditySymmetric {
133+
self.execute(DexRawAction::ProvideLiquiditySymmetric {
134134
offer_asset: offer_asset.into(),
135135
paired_assets: paired_assets.into_iter().map(Into::into).collect(),
136136
pool: pool.into(),
@@ -143,7 +143,7 @@ pub mod raw {
143143
lp_token: Asset,
144144
pool: PoolAddress,
145145
) -> AbstractSdkResult<CosmosMsg> {
146-
self.request(DexRawAction::WithdrawLiquidity {
146+
self.execute(DexRawAction::WithdrawLiquidity {
147147
lp_token: lp_token.into(),
148148
pool: pool.into(),
149149
})
@@ -240,10 +240,10 @@ pub mod ans {
240240
}
241241

242242
/// Executes a [DexAction] in th DEX
243-
fn request(&self, action: DexAnsAction) -> AbstractSdkResult<CosmosMsg> {
243+
fn execute(&self, action: DexAnsAction) -> AbstractSdkResult<CosmosMsg> {
244244
let adapters = self.base.adapters(self.deps);
245245

246-
adapters.request(
246+
adapters.execute(
247247
self.dex_module_id(),
248248
DexExecuteMsg::AnsAction {
249249
dex: self.dex_name(),
@@ -260,7 +260,7 @@ pub mod ans {
260260
max_spread: Option<Decimal>,
261261
belief_price: Option<Decimal>,
262262
) -> AbstractSdkResult<CosmosMsg> {
263-
self.request(DexAnsAction::Swap {
263+
self.execute(DexAnsAction::Swap {
264264
offer_asset,
265265
ask_asset,
266266
belief_price,
@@ -274,7 +274,7 @@ pub mod ans {
274274
assets: Vec<AnsAsset>,
275275
max_spread: Option<Decimal>,
276276
) -> AbstractSdkResult<CosmosMsg> {
277-
self.request(DexAnsAction::ProvideLiquidity { assets, max_spread })
277+
self.execute(DexAnsAction::ProvideLiquidity { assets, max_spread })
278278
}
279279

280280
/// Provide symmetrict liquidity in the DEX
@@ -283,15 +283,15 @@ pub mod ans {
283283
offer_asset: AnsAsset,
284284
paired_assets: Vec<AssetEntry>,
285285
) -> AbstractSdkResult<CosmosMsg> {
286-
self.request(DexAnsAction::ProvideLiquiditySymmetric {
286+
self.execute(DexAnsAction::ProvideLiquiditySymmetric {
287287
offer_asset,
288288
paired_assets,
289289
})
290290
}
291291

292292
/// Withdraw liquidity from the DEX
293293
pub fn withdraw_liquidity(&self, lp_token: AnsAsset) -> AbstractSdkResult<CosmosMsg> {
294-
self.request(DexAnsAction::WithdrawLiquidity { lp_token })
294+
self.execute(DexAnsAction::WithdrawLiquidity { lp_token })
295295
}
296296
}
297297

‎modules/contracts/adapters/money-market/src/api.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ pub mod raw {
8686
}
8787

8888
/// Executes a [MoneyMarketRawAction] in th MONEY_MARKET
89-
fn request(&self, action: MoneyMarketRawAction) -> AbstractSdkResult<CosmosMsg> {
89+
fn execute(&self, action: MoneyMarketRawAction) -> AbstractSdkResult<CosmosMsg> {
9090
let adapters = self.base.adapters(self.deps);
9191

92-
adapters.request(
92+
adapters.execute(
9393
self.money_market_module_id(),
9494
MoneyMarketExecuteMsg::RawAction {
9595
money_market: self.money_market_name(),
@@ -104,7 +104,7 @@ pub mod raw {
104104
contract_addr: Addr,
105105
lending_asset: Asset,
106106
) -> AbstractSdkResult<CosmosMsg> {
107-
self.request(MoneyMarketRawAction {
107+
self.execute(MoneyMarketRawAction {
108108
contract_addr: contract_addr.to_string(),
109109
request: MoneyMarketRawRequest::Deposit {
110110
lending_asset: lending_asset.into(),
@@ -118,7 +118,7 @@ pub mod raw {
118118
contract_addr: Addr,
119119
lent_asset: Asset,
120120
) -> AbstractSdkResult<CosmosMsg> {
121-
self.request(MoneyMarketRawAction {
121+
self.execute(MoneyMarketRawAction {
122122
contract_addr: contract_addr.to_string(),
123123
request: MoneyMarketRawRequest::Withdraw {
124124
lent_asset: lent_asset.into(),
@@ -133,7 +133,7 @@ pub mod raw {
133133
collateral_asset: Asset,
134134
borrowable_asset: AssetInfo,
135135
) -> AbstractSdkResult<CosmosMsg> {
136-
self.request(MoneyMarketRawAction {
136+
self.execute(MoneyMarketRawAction {
137137
contract_addr: contract_addr.to_string(),
138138
request: MoneyMarketRawRequest::ProvideCollateral {
139139
collateral_asset: collateral_asset.into(),
@@ -149,7 +149,7 @@ pub mod raw {
149149
collateral_asset: Asset,
150150
borrowable_asset: AssetInfo,
151151
) -> AbstractSdkResult<CosmosMsg> {
152-
self.request(MoneyMarketRawAction {
152+
self.execute(MoneyMarketRawAction {
153153
contract_addr: contract_addr.to_string(),
154154
request: MoneyMarketRawRequest::WithdrawCollateral {
155155
collateral_asset: collateral_asset.into(),
@@ -165,7 +165,7 @@ pub mod raw {
165165
collateral_asset: AssetInfo,
166166
borrow_asset: Asset,
167167
) -> AbstractSdkResult<CosmosMsg> {
168-
self.request(MoneyMarketRawAction {
168+
self.execute(MoneyMarketRawAction {
169169
contract_addr: contract_addr.to_string(),
170170
request: MoneyMarketRawRequest::Borrow {
171171
collateral_asset: collateral_asset.into(),
@@ -181,7 +181,7 @@ pub mod raw {
181181
collateral_asset: AssetInfo,
182182
borrowed_asset: Asset,
183183
) -> AbstractSdkResult<CosmosMsg> {
184-
self.request(MoneyMarketRawAction {
184+
self.execute(MoneyMarketRawAction {
185185
contract_addr: contract_addr.to_string(),
186186
request: MoneyMarketRawRequest::Repay {
187187
collateral_asset: collateral_asset.into(),
@@ -325,10 +325,10 @@ pub mod ans {
325325
}
326326

327327
/// Executes a [MoneyMarketAction] in th MONEY_MARKET
328-
fn request(&self, action: MoneyMarketAnsAction) -> AbstractSdkResult<CosmosMsg> {
328+
fn execute(&self, action: MoneyMarketAnsAction) -> AbstractSdkResult<CosmosMsg> {
329329
let adapters = self.base.adapters(self.deps);
330330

331-
adapters.request(
331+
adapters.execute(
332332
self.money_market_module_id(),
333333
MoneyMarketExecuteMsg::AnsAction {
334334
money_market: self.money_market_name(),
@@ -339,12 +339,12 @@ pub mod ans {
339339

340340
/// Deposit assets
341341
pub fn deposit(&self, lending_asset: AnsAsset) -> AbstractSdkResult<CosmosMsg> {
342-
self.request(MoneyMarketAnsAction::Deposit { lending_asset })
342+
self.execute(MoneyMarketAnsAction::Deposit { lending_asset })
343343
}
344344

345345
/// Withdraw liquidity from MONEY_MARKET
346346
pub fn withdraw(&self, lent_asset: AnsAsset) -> AbstractSdkResult<CosmosMsg> {
347-
self.request(MoneyMarketAnsAction::Withdraw { lent_asset })
347+
self.execute(MoneyMarketAnsAction::Withdraw { lent_asset })
348348
}
349349

350350
/// Deposit Collateral in MONEY_MARKET
@@ -353,7 +353,7 @@ pub mod ans {
353353
collateral_asset: AnsAsset,
354354
borrowable_asset: AssetEntry,
355355
) -> AbstractSdkResult<CosmosMsg> {
356-
self.request(MoneyMarketAnsAction::ProvideCollateral {
356+
self.execute(MoneyMarketAnsAction::ProvideCollateral {
357357
collateral_asset,
358358
borrowable_asset,
359359
})
@@ -365,7 +365,7 @@ pub mod ans {
365365
collateral_asset: AnsAsset,
366366
borrowable_asset: AssetEntry,
367367
) -> AbstractSdkResult<CosmosMsg> {
368-
self.request(MoneyMarketAnsAction::WithdrawCollateral {
368+
self.execute(MoneyMarketAnsAction::WithdrawCollateral {
369369
collateral_asset,
370370
borrowable_asset,
371371
})
@@ -377,7 +377,7 @@ pub mod ans {
377377
collateral_asset: AssetEntry,
378378
borrow_asset: AnsAsset,
379379
) -> AbstractSdkResult<CosmosMsg> {
380-
self.request(MoneyMarketAnsAction::Borrow {
380+
self.execute(MoneyMarketAnsAction::Borrow {
381381
collateral_asset,
382382
borrow_asset,
383383
})
@@ -389,7 +389,7 @@ pub mod ans {
389389
collateral_asset: AssetEntry,
390390
borrowed_asset: AnsAsset,
391391
) -> AbstractSdkResult<CosmosMsg> {
392-
self.request(MoneyMarketAnsAction::Repay {
392+
self.execute(MoneyMarketAnsAction::Repay {
393393
collateral_asset,
394394
borrowed_asset,
395395
})

‎modules/contracts/apps/croncat/src/api.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ impl<'a, T: CronCatInterface> CronCat<'a, T> {
5454
task_tag: impl Into<String>,
5555
assets: AssetListUnchecked,
5656
) -> AbstractSdkResult<CosmosMsg> {
57-
self.base.apps(self.deps).request(
57+
self.base.apps(self.deps).execute(
5858
self.module_id,
5959
AppExecuteMsg::CreateTask {
6060
task: Box::new(task),
@@ -70,7 +70,7 @@ impl<'a, T: CronCatInterface> CronCat<'a, T> {
7070
task_tag: impl Into<String>,
7171
assets: AssetListUnchecked,
7272
) -> AbstractSdkResult<CosmosMsg> {
73-
self.base.apps(self.deps).request(
73+
self.base.apps(self.deps).execute(
7474
self.module_id,
7575
AppExecuteMsg::RefillTask {
7676
task_tag: task_tag.into(),
@@ -81,7 +81,7 @@ impl<'a, T: CronCatInterface> CronCat<'a, T> {
8181

8282
// Remove task by tag
8383
pub fn remove_task(&self, task_tag: impl Into<String>) -> AbstractSdkResult<CosmosMsg> {
84-
self.base.apps(self.deps).request(
84+
self.base.apps(self.deps).execute(
8585
self.module_id,
8686
AppExecuteMsg::RemoveTask {
8787
task_tag: task_tag.into(),
@@ -93,7 +93,7 @@ impl<'a, T: CronCatInterface> CronCat<'a, T> {
9393
pub fn purge(&self, task_tags: Vec<String>) -> AbstractSdkResult<CosmosMsg> {
9494
self.base
9595
.apps(self.deps)
96-
.request(self.module_id, AppExecuteMsg::Purge { task_tags })
96+
.execute(self.module_id, AppExecuteMsg::Purge { task_tags })
9797
}
9898
}
9999

0 commit comments

Comments
 (0)