Fixed merge conflict and removed logs

SolarDao · Jul 24, 2024 · a18c531 · a18c531
1 parent b5fce71
commit a18c531
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 27 deletions.
diff --git a/cosmwasm/contracts/wattpeak-staker/src/execute.rs b/cosmwasm/contracts/wattpeak-staker/src/execute.rs
@@ -5,7 +5,7 @@ use cosmwasm_std::{
 
 use crate::{
     helpers::{
-        calculate_interest_after_epoch, calculate_staker_share_of_reward, set_yearly_percentage
+        calculate_interest_after_epoch, calculate_staker_share_of_reward, set_yearly_percentage,
     },
     msg::ExecuteMsg,
     state::{Staker, CONFIG, STAKERS, TOTAL_WATTPEAK_STAKED},
@@ -70,10 +70,9 @@ fn update_config(
     Ok(Response::new().add_attribute("action", "update_config"))
 }
 
-
 fn stake_wattpeak(deps: DepsMut, env: Env, info: MessageInfo) -> StdResult<Response> {
     let staker_address = &info.sender;
-    
+
     let amount = info
         .funds
         .iter()
@@ -126,7 +125,6 @@ fn stake_wattpeak(deps: DepsMut, env: Env, info: MessageInfo) -> StdResult<Respo
 }
 
 fn deposit_rewards(deps: DepsMut, env: Env, info: MessageInfo) -> StdResult<Response> {
-
     let amount = info
         .funds
         .iter()
@@ -171,7 +169,9 @@ fn unstake_wattpeak(
 
     let staker_address = &info.sender;
 
-    let mut staker = STAKERS.load(deps.storage, staker_address.clone()).map_err(|_| StdError::generic_err("Staker does not exist"))?;
+    let mut staker = STAKERS
+        .load(deps.storage, staker_address.clone())
+        .map_err(|_| StdError::generic_err("Staker does not exist"))?;
 
     // Check if the staker has enough wattpeak staked
     if staker.wattpeak_staked < amount {
@@ -191,7 +191,9 @@ fn unstake_wattpeak(
         to_address: staker_address.to_string(),
         amount: vec![Coin {
             //Change to correct contract address when minter is deployed
-            denom: "factory/juno16g2g3fx3h9syz485ydqu26zjq8plr3yusykdkw3rjutaprvl340sm9s2gn/uwattpeak".to_string(),
+            denom:
+                "factory/juno16g2g3fx3h9syz485ydqu26zjq8plr3yusykdkw3rjutaprvl340sm9s2gn/uwattpeak"
+                    .to_string(),
             amount: amount,
         }],
     };
@@ -233,7 +235,9 @@ fn claim_rewards(deps: DepsMut, _env: Env, info: MessageInfo) -> StdResult<Respo
         to_address: staker_address.to_string(),
         amount: vec![Coin {
             //Change to correct contract address when minter is deployed
-            denom: "factory/juno16g2g3fx3h9syz485ydqu26zjq8plr3yusykdkw3rjutaprvl340sm9s2gn/uwattpeak".to_string(),
+            denom:
+                "factory/juno16g2g3fx3h9syz485ydqu26zjq8plr3yusykdkw3rjutaprvl340sm9s2gn/uwattpeak"
+                    .to_string(),
             amount: rewards_amount,
         }],
     };
@@ -383,7 +387,6 @@ mod tests {
                 res.unwrap_err().to_string(),
                 "Generic error: rewards_percentage cannot be greater than 100%"
             );
-
         }
     }
     mod staking_tests {
@@ -705,7 +708,6 @@ mod tests {
                 res.err().unwrap().to_string(),
                 "Generic error: Unstake amount can't be zero"
             );
-
         }
         #[test]
         fn remove_staker() {
@@ -922,7 +924,7 @@ mod tests {
             assert_eq!(staker.claimable_rewards, Decimal::zero());
         }
         #[test]
-        fn claim_rewards_multiple_epochs () {
+        fn claim_rewards_multiple_epochs() {
             let mut deps = mock_dependencies();
             let mut env = mock_env();
 
@@ -934,8 +936,8 @@ mod tests {
                 },
             };
 
-            let info = mock_info("creator", &[]);
-            let _res = instantiate(deps.as_mut(), env.clone(), info, msg).unwrap();
+            let info = mock_info("admin", &[]);
+            let _res = instantiate(deps.as_mut(), env.clone(), info.clone(), msg).unwrap();
 
             let staker_info1 = mock_info("addr1", &[Coin::new(100u128, "factory/juno16g2g3fx3h9syz485ydqu26zjq8plr3yusykdkw3rjutaprvl340sm9s2gn/uwattpeak")]);
             let staker_info2 = mock_info("addr2", &[Coin::new(200u128, "factory/juno16g2g3fx3h9syz485ydqu26zjq8plr3yusykdkw3rjutaprvl340sm9s2gn/uwattpeak")]);
@@ -964,11 +966,11 @@ mod tests {
             )
             .unwrap();
 
-            calculate_interest_after_epoch(deps.as_mut()).unwrap();
-            calculate_interest_after_epoch(deps.as_mut()).unwrap();
-            calculate_interest_after_epoch(deps.as_mut()).unwrap();
-            calculate_interest_after_epoch(deps.as_mut()).unwrap();
-            calculate_interest_after_epoch(deps.as_mut()).unwrap();
+            calculate_interest_after_epoch(deps.as_mut(), info.clone()).unwrap();
+            calculate_interest_after_epoch(deps.as_mut(), info.clone()).unwrap();
+            calculate_interest_after_epoch(deps.as_mut(), info.clone()).unwrap();
+            calculate_interest_after_epoch(deps.as_mut(), info.clone()).unwrap();
+            calculate_interest_after_epoch(deps.as_mut(), info.clone()).unwrap();
 
             env = mock_env();
             let funds = Coin {
@@ -1197,8 +1199,8 @@ mod tests {
                 },
             };
 
-            let info = mock_info("creator", &[]);
-            let _res = instantiate(deps.as_mut(), env.clone(), info, msg).unwrap();
+            let info = mock_info("admin", &[]);
+            let _res = instantiate(deps.as_mut(), env.clone(), info.clone(), msg).unwrap();
 
             let staker_info1 = mock_info("addr1", &[Coin::new(100u128, "factory/juno16g2g3fx3h9syz485ydqu26zjq8plr3yusykdkw3rjutaprvl340sm9s2gn/uwattpeak")]);
             let deposit_amount = Uint128::from(5000000u128);
@@ -1211,11 +1213,11 @@ mod tests {
             )
             .unwrap();
 
-            calculate_interest_after_epoch(deps.as_mut()).unwrap();
-            calculate_interest_after_epoch(deps.as_mut()).unwrap();
-            calculate_interest_after_epoch(deps.as_mut()).unwrap();
-            calculate_interest_after_epoch(deps.as_mut()).unwrap();
-            calculate_interest_after_epoch(deps.as_mut()).unwrap();
+            calculate_interest_after_epoch(deps.as_mut(), info.clone()).unwrap();
+            calculate_interest_after_epoch(deps.as_mut(), info.clone()).unwrap();
+            calculate_interest_after_epoch(deps.as_mut(), info.clone()).unwrap();
+            calculate_interest_after_epoch(deps.as_mut(), info.clone()).unwrap();
+            calculate_interest_after_epoch(deps.as_mut(), info.clone()).unwrap();
 
             env = mock_env();
             let funds = Coin {

diff --git a/cosmwasm/contracts/wattpeak-staker/src/helpers.rs b/cosmwasm/contracts/wattpeak-staker/src/helpers.rs
@@ -77,10 +77,7 @@ pub fn calculate_staker_share_of_reward(
             .interest_wattpeak
             .checked_div(total_interest_wattpeak)
             .unwrap();
-        println!("{}", staker.interest_wattpeak);
-        println!("{}", share);
         let reward = decimal_amount.checked_mul(share).unwrap();
-        println!("{}", reward);
         staker.claimable_rewards = staker.claimable_rewards.checked_add(reward).unwrap();
         staker.interest_wattpeak = Decimal::zero();