Skip to content

Commit

Permalink
fix: fmt and linting
Browse files Browse the repository at this point in the history
  • Loading branch information
emidev98 committed Feb 19, 2024
1 parent b0cbc68 commit 6f0529a
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 27 deletions.
15 changes: 7 additions & 8 deletions contracts/alliance-lp-hub/src/contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ fn stake(deps: DepsMut, sender: Addr, received_asset: Asset) -> Result<Response,
)?;
USER_BALANCES.update(
deps.storage,
(sender.clone(), deposit_asset_key.clone()),
(sender, deposit_asset_key),
|b| -> Result<_, ContractError> { Ok(b.unwrap_or_default() + received_asset.amount) },
)?;

Expand Down Expand Up @@ -501,15 +501,15 @@ fn _claim_rewards(
(
user.clone(),
deposit_asset_key.clone(),
reward_asset_info_key.clone(),
reward_asset_info_key,
),
);

if let Ok(user_asset_reward_rate) = user_asset_reward_rate {
if user_balance.is_zero() {
return Ok(PendingRewards::new(
deposit_asset.clone(),
reward_asset.clone(),
reward_asset,
Uint128::zero(),
));
} else {
Expand All @@ -519,14 +519,14 @@ fn _claim_rewards(

return Ok(PendingRewards::new(
deposit_asset.clone(),
reward_asset.clone(),
reward_asset,
rewards,
));
}
}
Ok(PendingRewards::new(
deposit_asset.clone(),
reward_asset.clone(),
reward_asset,
Uint128::zero(),
))
})
Expand Down Expand Up @@ -708,7 +708,7 @@ fn update_rewards(deps: DepsMut, env: Env, info: MessageInfo) -> Result<Response

// Iterate the lp_tokens_list and create the necessary submessages
// appending them to the contract response.
for lp_token in lp_tokens_list.clone() {
for lp_token in lp_tokens_list {
let msg = CosmosMsg::Wasm(WasmMsg::Execute {
contract_addr: config.astro_incentives_addr.to_string(),
msg: to_json_binary(&ExecuteAstroMsg::ClaimRewards {
Expand All @@ -732,7 +732,7 @@ fn update_rewards(deps: DepsMut, env: Env, info: MessageInfo) -> Result<Response
value: Binary::from(
MsgClaimDelegationRewards {
delegator_address: env.contract.address.to_string(),
validator_address: v.to_string(),
validator_address: v,
denom: config.alliance_token_denom.clone(),
}
.encode_to_vec(),
Expand Down Expand Up @@ -772,7 +772,6 @@ fn update_alliance_reward_callback(
let reward_asset_info_key = AssetInfoKey::from(config.alliance_reward_denom.clone());
let current_balance = config
.alliance_reward_denom
.clone()
.query_balance(&deps.querier, env.contract.address)?;
let previous_balance = TEMP_BALANCE.load(deps.storage, reward_asset_info_key.clone())?;
let rewards_collected = current_balance - previous_balance;
Expand Down
6 changes: 1 addition & 5 deletions contracts/alliance-lp-hub/src/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,7 @@ fn get_address_pending_rewards(deps: Deps, query: AddressPendingRewardsQuery) ->
let reward_asset_key = AssetInfoKey::from(reward_asset_info.clone());

let user_balance = *user_balances.get(&deposit_asset).unwrap();
let key = (
addr.clone(),
deposit_asset_key.clone(),
reward_asset_key.clone(),
);
let key = (addr.clone(), deposit_asset_key, reward_asset_key);
let user_reward_rate = USER_ASSET_REWARD_RATE
.load(deps.storage, key.clone())
.unwrap_or_default();
Expand Down
4 changes: 2 additions & 2 deletions contracts/alliance-lp-hub/src/tests/query_rewards.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fn test_query_pending_rewards() {
.save(deps.storage.borrow_mut(), key, &Uint128::new(1))
.unwrap();

let key = (addr_key.clone(), deposit_key.clone(), reward_key.clone());
let key = (addr_key, deposit_key, reward_key);
UNCLAIMED_REWARDS
.save(deps.storage.borrow_mut(), key, &Uint128::new(1))
.unwrap();
Expand Down Expand Up @@ -107,7 +107,7 @@ fn test_query_all_pending_rewards() {
.save(deps.storage.borrow_mut(), key, &Uint128::new(1))
.unwrap();

let key = (addr_key.clone(), deposit_key.clone(), reward_key.clone());
let key = (addr_key, deposit_key, reward_key);
UNCLAIMED_REWARDS
.save(deps.storage.borrow_mut(), key, &Uint128::new(1))
.unwrap();
Expand Down
16 changes: 4 additions & 12 deletions contracts/alliance-lp-hub/src/tests/query_stake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,10 @@ fn test_query_address_staked_balance() {
)
.unwrap();
WHITELIST
.save(
deps.storage.borrow_mut(),
deposit_key2.clone(),
&Decimal::one(),
)
.save(deps.storage.borrow_mut(), deposit_key2, &Decimal::one())
.unwrap();

let key = (addr_key.clone(), deposit_key.clone());
let key = (addr_key, deposit_key);
USER_BALANCES
.save(deps.storage.borrow_mut(), key, &Uint128::new(1))
.unwrap();
Expand Down Expand Up @@ -81,14 +77,10 @@ fn test_query_address_staked_balance_by_token() {
)
.unwrap();
WHITELIST
.save(
deps.storage.borrow_mut(),
deposit_key2.clone(),
&Decimal::one(),
)
.save(deps.storage.borrow_mut(), deposit_key2, &Decimal::one())
.unwrap();

let key = (addr_key.clone(), deposit_key.clone());
let key = (addr_key, deposit_key);
USER_BALANCES
.save(deps.storage.borrow_mut(), key, &Uint128::new(1))
.unwrap();
Expand Down

0 comments on commit 6f0529a

Please sign in to comment.