Skip to content

Commit de140d4

Browse files
Fix formatting
1 parent b657ff7 commit de140d4

File tree

31 files changed

+1127
-524
lines changed

31 files changed

+1127
-524
lines changed

contracts/auto-withdrawer/src/contract.rs

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::{
22
error::{ContractError, ContractResult},
33
msg::{
44
BondMsg, BondingResponse, BondingsResponse, ExecuteMsg, InstantiateMsg, MigrateMsg,
5-
QueryMsg, WithdrawalVoucherTransferNftMsg, WithdrawalVoucherSendNftMsg,
5+
QueryMsg, WithdrawalVoucherSendNftMsg, WithdrawalVoucherTransferNftMsg,
66
},
77
store::{
88
bondings_map,
@@ -125,12 +125,10 @@ fn execute_bond_with_nft(
125125

126126
let msg = WasmMsg::Execute {
127127
contract_addr: addrs.withdrawal_voucher_contract,
128-
msg: to_json_binary(
129-
&WithdrawalVoucherTransferNftMsg {
130-
recipient: env.contract.address.into_string(),
131-
token_id,
132-
},
133-
)?,
128+
msg: to_json_binary(&WithdrawalVoucherTransferNftMsg {
129+
recipient: env.contract.address.into_string(),
130+
token_id,
131+
})?,
134132
funds: vec![],
135133
};
136134

@@ -152,12 +150,10 @@ fn execute_unbond(
152150

153151
let nft_msg: CosmosMsg<NeutronMsg> = WasmMsg::Execute {
154152
contract_addr: addrs.withdrawal_voucher_contract,
155-
msg: to_json_binary(
156-
&WithdrawalVoucherTransferNftMsg {
157-
recipient: info.sender.to_string(),
158-
token_id,
159-
},
160-
)?,
153+
msg: to_json_binary(&WithdrawalVoucherTransferNftMsg {
154+
recipient: info.sender.to_string(),
155+
token_id,
156+
})?,
161157
funds: vec![],
162158
}
163159
.into();
@@ -189,17 +185,15 @@ fn execute_withdraw(
189185

190186
let withdraw_msg: CosmosMsg<NeutronMsg> = WasmMsg::Execute {
191187
contract_addr: addrs.withdrawal_voucher_contract,
192-
msg: to_json_binary(
193-
&WithdrawalVoucherSendNftMsg {
194-
contract: addrs.withdrawal_manager_contract,
195-
token_id,
196-
msg: to_json_binary(
197-
&drop_staking_base::msg::withdrawal_manager::ReceiveNftMsg::Withdraw {
198-
receiver: Some(bonding.bonder.into_string()),
199-
},
200-
)?,
201-
},
202-
)?,
188+
msg: to_json_binary(&WithdrawalVoucherSendNftMsg {
189+
contract: addrs.withdrawal_manager_contract,
190+
token_id,
191+
msg: to_json_binary(
192+
&drop_staking_base::msg::withdrawal_manager::ReceiveNftMsg::Withdraw {
193+
receiver: Some(bonding.bonder.into_string()),
194+
},
195+
)?,
196+
})?,
203197
funds: vec![],
204198
}
205199
.into();

contracts/auto-withdrawer/src/tests.rs

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ use crate::{
44
msg::{BondMsg, ExecuteMsg, InstantiateMsg},
55
store::{FACTORY_CONTRACT, LD_TOKEN},
66
};
7-
use cosmwasm_std::{attr, coin, testing::{mock_env, message_info}, Event, Addr};
7+
use cosmwasm_std::{
8+
attr, coin,
9+
testing::{message_info, mock_env},
10+
Addr, Event,
11+
};
812
use drop_helpers::testing::{mock_dependencies, mock_state_query};
913

1014
#[test]
@@ -23,7 +27,10 @@ fn instantiate() {
2327
.unwrap();
2428

2529
let factory_contract_address_storage = FACTORY_CONTRACT.load(deps.as_ref().storage).unwrap();
26-
assert_eq!(factory_contract_address_storage.as_str(), factory_contract_address_msg.as_str());
30+
assert_eq!(
31+
factory_contract_address_storage.as_str(),
32+
factory_contract_address_msg.as_str()
33+
);
2734
let ld_token = LD_TOKEN.load(deps.as_ref().storage).unwrap();
2835
assert_eq!(ld_token, "ld_token");
2936
assert_eq!(response.messages.len(), 0);
@@ -46,18 +53,18 @@ fn bond_missing_ld_assets() {
4653

4754
mock_state_query(&mut deps);
4855
FACTORY_CONTRACT
49-
.save(
50-
deps.as_mut().storage,
51-
&api.addr_make("factory_contract"),
52-
)
56+
.save(deps.as_mut().storage, &api.addr_make("factory_contract"))
5357
.unwrap();
5458
LD_TOKEN
5559
.save(deps.as_mut().storage, &"ld_token".into())
5660
.unwrap();
5761
let err = contract::execute(
5862
deps.as_mut(),
5963
mock_env(),
60-
message_info(&api.addr_make("sender"), &[coin(10, "uatom"), coin(20, "untrn")]),
64+
message_info(
65+
&api.addr_make("sender"),
66+
&[coin(10, "uatom"), coin(20, "untrn")],
67+
),
6168
ExecuteMsg::Bond(BondMsg::WithLdAssets {}),
6269
)
6370
.unwrap_err();
@@ -75,10 +82,7 @@ mod bond_missing_deposit {
7582

7683
mock_state_query(&mut deps);
7784
FACTORY_CONTRACT
78-
.save(
79-
deps.as_mut().storage,
80-
&api.addr_make("factory_contract"),
81-
)
85+
.save(deps.as_mut().storage, &api.addr_make("factory_contract"))
8286
.unwrap();
8387
LD_TOKEN
8488
.save(deps.as_mut().storage, &"ld_token".into())

contracts/core/src/contract.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use cosmwasm_schema::cw_serde;
22
use cosmwasm_std::{
33
attr, ensure, ensure_eq, ensure_ne, to_json_binary, Addr, Attribute, BankQuery, Binary, Coin,
4-
CosmosMsg, CustomQuery, Decimal, Deps, DepsMut, Env, GrpcQuery, MessageInfo, Order, QueryRequest,
5-
Response, StdError, StdResult, Uint128, Uint64, WasmMsg,
4+
CosmosMsg, CustomQuery, Decimal, Deps, DepsMut, Env, GrpcQuery, MessageInfo, Order,
5+
QueryRequest, Response, StdError, StdResult, Uint128, Uint64, WasmMsg,
66
};
77
use cw_storage_plus::Bound;
88
use drop_helpers::answer::response;
@@ -12,7 +12,8 @@ use drop_staking_base::{
1212
msg::{
1313
core::{
1414
BondCallback, BondHook, ExecuteMsg, FailedBatchResponse, InstantiateMsg,
15-
LastPuppeteerResponse, MigrateMsg, QueryMsg, WithdrawalVoucherMintMsg, WithdrawalVoucherMetadata, WithdrawalVoucherTrait,
15+
LastPuppeteerResponse, MigrateMsg, QueryMsg, WithdrawalVoucherMetadata,
16+
WithdrawalVoucherMintMsg, WithdrawalVoucherTrait,
1617
},
1718
token::{
1819
ConfigResponse as TokenConfigResponse, ExecuteMsg as TokenExecuteMsg,
@@ -1267,7 +1268,9 @@ fn get_unbonding_msg<T>(
12671268
{
12681269
let current_exchange_rate = query_exchange_rate(deps.as_ref(), config)?;
12691270
attrs.push(attr("exchange_rate", current_exchange_rate.to_string()));
1270-
let expected_native_asset_amount = unbond.total_dasset_amount_to_withdraw.mul_floor(current_exchange_rate);
1271+
let expected_native_asset_amount = unbond
1272+
.total_dasset_amount_to_withdraw
1273+
.mul_floor(current_exchange_rate);
12711274

12721275
let calc_withdraw_query_result: Result<Vec<(String, Uint128)>, StdError> =
12731276
deps.querier.query_wasm_smart(

0 commit comments

Comments
 (0)