fix: reward asset and linting

Author: emidev98

contracts/alliance-hub/src/tests/stake_unstake.rs

@@ -99,7 +99,10 @@ fn test_stake_invalid() {
     let msg = ExecuteMsg::Stake {};
     let info = mock_info("user1", &[coin(100, "asset2")]);
     let err = execute(deps.as_mut(), mock_env(), info, msg).unwrap_err();
-    assert_eq!(err, ContractError::AssetNotWhitelisted("native:asset2".to_string()));
+    assert_eq!(
+        err,
+        ContractError::AssetNotWhitelisted("native:asset2".to_string())
+    );
 
     // Stake multiple assets in a single call
     let msg = ExecuteMsg::Stake {};

contracts/alliance-lp-hub/src/astro_models.rs

@@ -1,10 +1,8 @@
-use cosmwasm_schema::{QueryResponses, cw_serde};
-use cosmwasm_std::{Decimal, Addr, Uint128};
+use cosmwasm_schema::{cw_serde, QueryResponses};
+use cosmwasm_std::{Addr, Decimal, Uint128};
 use cw20::Cw20ReceiveMsg;
 use cw_asset::AssetInfo;
 
-
-
 #[cw_serde]
 pub enum ExecuteAstroMsg {
     /// Receives a message of type [`Cw20ReceiveMsg`]. Handles cw20 LP token deposits.
@@ -29,7 +27,6 @@ pub enum Cw20Msg {
     DepositFor(String),
 }
 
-
 #[cw_serde]
 #[derive(QueryResponses)]
 pub enum QueryAstroMsg {
@@ -85,4 +82,4 @@ pub enum AstroAssetInfo {
     Token { contract_addr: Addr },
     /// Native token
     NativeToken { denom: String },
-}
+}

contracts/alliance-lp-hub/src/contract.rs

@@ -193,7 +193,7 @@ fn stake(
         deps.storage,
         sender.clone(),
         received_asset.info.clone(),
-        reward_token,
+        reward_token.clone(),
     )?;
     if !rewards.is_zero() {
         UNCLAIMED_REWARDS.update(
@@ -285,6 +285,15 @@ fn stake(
             Ok(balance.unwrap_or(Uint128::zero()) + received_asset.amount)
         },
     )?;
+
+    let asset_reward_rate = ASSET_REWARD_RATE
+        .load(deps.storage, (asset_key.clone(), reward_token.clone()))
+        .unwrap_or(Decimal::zero());
+    USER_ASSET_REWARD_RATE.save(
+        deps.storage,
+        (sender, asset_key, reward_token),
+        &asset_reward_rate,
+    )?;
     Ok(res)
 }
 
@@ -360,7 +369,7 @@ fn claim_rewards(
 ) -> Result<Response, ContractError> {
     let user = info.sender;
     let config = CONFIG.load(deps.storage)?;
-    let reward_token = AssetInfoKey::from(AssetInfo::Native(config.alliance_token_denom));
+    let reward_token = AssetInfoKey::from(AssetInfo::Native(config.alliance_reward_denom.clone()));
     let rewards = _claim_alliance_rewards(deps.storage, user.clone(), asset.clone(), reward_token)?;
     let unclaimed_rewards = UNCLAIMED_REWARDS
         .load(
@@ -411,14 +420,14 @@ fn _claim_alliance_rewards(
         let rewards = ((asset_reward_rate - user_reward_rate) * user_staked).to_uint_floor();
 
         if rewards.is_zero() {
-            return Ok(Uint128::zero());
+            Ok(Uint128::zero())
         } else {
             USER_ASSET_REWARD_RATE.save(storage, state_key, &asset_reward_rate)?;
-            return Ok(rewards);
+            Ok(rewards)
         }
     } else {
         USER_ASSET_REWARD_RATE.save(storage, state_key, &asset_reward_rate)?;
-        return Ok(Uint128::zero());
+        Ok(Uint128::zero())
     }
 }
 
@@ -711,7 +720,7 @@ fn update_alliance_reward_callback(
                 (asset_key.clone(), reward_asset_info_key.clone()),
                 |rate| -> StdResult<_> {
                     let mut reward_rate = rate.unwrap_or_default();
-                    reward_rate = reward_rate + rate_to_update;
+                    reward_rate += rate_to_update;
                     Ok(reward_rate)
                 },
             )?;
@@ -878,5 +887,6 @@ fn reply_claim_astro_rewards(
             )?;
         }
     }
-    return Ok(res.add_attribute("action", "claim_astro_rewards_success"));
+    
+    Ok(res.add_attribute("action", "claim_astro_rewards_success"))
 }

contracts/alliance-lp-hub/src/helpers.rs

@@ -3,7 +3,6 @@ use cosmwasm_std::MessageInfo;
 
 use crate::models::Config;
 
-
 // Controller is used to perform administrative operations that deals with delegating the virtual
 // tokens to the expected validators
 pub fn is_controller(info: &MessageInfo, config: &Config) -> Result<(), ContractError> {

contracts/alliance-lp-hub/src/lib.rs

@@ -1,9 +1,9 @@
+pub mod astro_models;
 pub mod contract;
+pub mod helpers;
 pub mod models;
 pub mod query;
 pub mod state;
-pub mod astro_models;
-pub mod helpers;
 
 #[cfg(test)]
 mod tests;

contracts/alliance-lp-hub/src/models.rs

@@ -8,9 +8,7 @@ use cosmwasm_schema::{cw_serde, QueryResponses};
 use cosmwasm_std::{Addr, Coins, Uint128};
 use cw20::Cw20ReceiveMsg;
 use cw_asset::{Asset, AssetInfo, AssetInfoKey};
-use std::{
-    collections::{HashMap, HashSet},
-};
+use std::collections::{HashMap, HashSet};
 
 pub type AssetDenom = String;
 

contracts/alliance-lp-hub/src/query.rs

@@ -144,9 +144,10 @@ fn get_all_pending_rewards(deps: Deps, query: AllPendingRewardsQuery) -> StdResu
             let deposit_asset = AssetInfoKey::from(assets.0.check(deps.api, None)?);
             let reward_asset = AssetInfoKey::from(assets.1.check(deps.api, None)?);
 
-            let asset_reward_rate =
-                ASSET_REWARD_RATE.load(deps.storage, (deposit_asset.clone(), reward_asset.clone()))?;
-            let user_balance = BALANCES.load(deps.storage, (addr.clone(), deposit_asset.clone()))?;
+            let asset_reward_rate = ASSET_REWARD_RATE
+                .load(deps.storage, (deposit_asset.clone(), reward_asset.clone()))?;
+            let user_balance =
+                BALANCES.load(deps.storage, (addr.clone(), deposit_asset.clone()))?;
             let unclaimed_rewards = UNCLAIMED_REWARDS
                 .load(deps.storage, (addr.clone(), deposit_asset))
                 .unwrap_or_default();

contracts/alliance-lp-hub/src/state.rs

@@ -37,4 +37,4 @@ pub const TEMP_BALANCE: Map<AssetInfoKey, Uint128> = Map::new("temp_balance");
 // Temporary variable used to store the user address
 // so we can access it on reply_claim_astro_rewards
 // callback function and account for the rewards
-pub const TEMP_USR_ADDR: Item<Addr> = Item::new("temp_addr_stake");
+pub const TEMP_USR_ADDR: Item<Addr> = Item::new("temp_addr_stake");

contracts/alliance-lp-hub/src/tests/helpers.rs

@@ -1,7 +1,7 @@
 use crate::contract::{execute, instantiate};
 use crate::models::{
-    AllPendingRewardsQuery, AssetQuery, Config, ExecuteMsg, InstantiateMsg, PendingRewardsRes,
-    QueryMsg, StakedBalanceRes, ModifyAssetPair,
+    AllPendingRewardsQuery, AssetQuery, Config, ExecuteMsg, InstantiateMsg, ModifyAssetPair,
+    PendingRewardsRes, QueryMsg, StakedBalanceRes,
 };
 use crate::query::query;
 use crate::state::CONFIG;
@@ -11,7 +11,7 @@ use alliance_protocol::alliance_protocol::{
 };
 use alliance_protocol::token_factory::CustomExecuteMsg;
 use cosmwasm_std::testing::{mock_env, mock_info};
-use cosmwasm_std::{coin, from_json, Deps, DepsMut, Response, StdResult, Uint128, Binary, Addr};
+use cosmwasm_std::{coin, from_json, Addr, Binary, Deps, DepsMut, Response, StdResult, Uint128};
 use cw20::Cw20ReceiveMsg;
 use cw_asset::{Asset, AssetInfo};
 
@@ -24,7 +24,7 @@ pub fn setup_contract(deps: DepsMut) -> Response<CustomExecuteMsg> {
     let init_msg = InstantiateMsg {
         governance: "gov".to_string(),
         fee_collector_address: "collector_address".to_string(),
-        astro_incentives_address : "astro_incentives".to_string(),
+        astro_incentives_address: "astro_incentives".to_string(),
         controller: "controller".to_string(),
         reward_denom: "uluna".to_string(),
     };
@@ -51,19 +51,17 @@ pub fn modify_asset(deps: DepsMut, assets: Vec<ModifyAssetPair>) -> Response {
     execute(deps, env, info, msg).unwrap()
 }
 
-
 pub fn stake(deps: DepsMut, user: &str, amount: u128, denom: &str) -> Response {
     let info = mock_info(user, &[coin(amount, denom)]);
     let env = mock_env();
     let msg = ExecuteMsg::Stake {};
     execute(deps, env, info, msg).unwrap()
 }
 
-
 pub fn stake_cw20(deps: DepsMut, user: &str, amount: u128, denom: &str) -> Response {
     let mut info = mock_info(user, &[]);
     let env = mock_env();
-    let msg = ExecuteMsg::Receive(Cw20ReceiveMsg{
+    let msg = ExecuteMsg::Receive(Cw20ReceiveMsg {
         sender: String::from(user),
         amount: Uint128::new(amount),
         msg: Binary::default(),
@@ -133,7 +131,12 @@ pub fn claim_rewards(deps: DepsMut, user: &str, denom: &str) -> Response {
     execute(deps, env, info, msg).unwrap()
 }
 
-pub fn query_rewards(deps: Deps, user: &str, deposit_asset: &str, reward_asset: &str ) -> PendingRewardsRes {
+pub fn query_rewards(
+    deps: Deps,
+    user: &str,
+    deposit_asset: &str,
+    reward_asset: &str,
+) -> PendingRewardsRes {
     from_json(
         query(
             deps,

contracts/alliance-lp-hub/src/tests/mod.rs

@@ -1,6 +1,6 @@
+mod alliance;
 mod helpers;
 mod instantiate;
-mod stake_unstake;
+mod mock_querier;
 mod rewards;
-mod alliance;
-mod mock_querier;
+mod stake_unstake;