diff --git a/src/contract.rs b/src/contract.rs index 1b90286..0379e0a 100644 --- a/src/contract.rs +++ b/src/contract.rs @@ -96,12 +96,6 @@ pub fn execute( env, info, ), - ExecuteMsg::SetRefundable { campaign_id } => set_refundable( - deps, - env, - info, - campaign_id, - ), ExecuteMsg::Cancel { campaign_id } => cancel( deps, env, @@ -168,7 +162,6 @@ pub fn deposit( &Campaign { owner: info.sender, amount: amount_sent, - refundable: false, }, )? } @@ -396,33 +389,6 @@ pub fn withdraw_fee( return Ok(res) } -pub fn set_refundable( - deps: DepsMut, - _env: Env, - info: MessageInfo, - campaign_id: String, -) -> Result { - let state = STATE.load(deps.storage)?; - - if deps.api.addr_canonicalize(info.sender.as_str())? != state.owner { - return Err(StdError::generic_err("Only contract owner can make the campaign refundable")); - } - - if !CAMPAIGN_POOL.has(deps.storage, campaign_id.clone()){ - return Err(StdError::generic_err("Campaign does not exist")) - } - - CAMPAIGN_POOL.update(deps.storage, campaign_id, |campaign| { - let mut campaign = campaign.unwrap(); - campaign.refundable = true; - Ok::(campaign) - })?; - - return Ok(Response::new() - .add_attribute("method", "set_refundable") - ); -} - pub fn cancel( deps: DepsMut, _env: Env, @@ -437,10 +403,6 @@ pub fn cancel( return Err(StdError::generic_err("Only campaign owner can cancel the campaign")); } - if !campaign.refundable { - return Err(StdError::generic_err("Campaign was not set to be refundable")); - } - if campaign.amount < Uint128::one() { CAMPAIGN_POOL.remove(deps.storage, campaign_id); return Ok(Response::new() @@ -489,7 +451,6 @@ pub fn set_cpool( CAMPAIGN_POOL.save(deps.storage, campaign_id, &Campaign { owner: info.sender, amount, - refundable: false, }) } }?; diff --git a/src/msg.rs b/src/msg.rs index dce1703..5e9dd81 100644 --- a/src/msg.rs +++ b/src/msg.rs @@ -52,9 +52,6 @@ pub enum ExecuteMsg { amount: Uint128, }, WithdrawFee {}, - SetRefundable { - campaign_id: String - }, Cancel { campaign_id: String }, diff --git a/src/state.rs b/src/state.rs index 3db28c8..9c88a7b 100644 --- a/src/state.rs +++ b/src/state.rs @@ -7,7 +7,6 @@ use serde::{Deserialize, Serialize}; pub struct Campaign { pub amount: Uint128, pub owner: Addr, - pub refundable: bool, } #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)] diff --git a/src/tests/execute/cancel.rs b/src/tests/execute/cancel.rs index ef171d9..4923343 100644 --- a/src/tests/execute/cancel.rs +++ b/src/tests/execute/cancel.rs @@ -10,7 +10,7 @@ use cosmwasm_std::{ use crate::contract::{ cancel, check, claim, deposit, instantiate, reward_all, set_claim_fee, set_cpool, - set_refundable, set_upool, withdraw, withdraw_fee, + set_upool, withdraw, withdraw_fee, }; use crate::msg::{ CampaignCheckRequest, CampaignCheckResponse, InstantiateMsg, UserRewardRequest, @@ -41,13 +41,6 @@ fn test_cancel_as_contract_owner() { ) .unwrap(); - set_refundable( - deps.as_mut(), - env.clone(), - mock_info("creator", &[]), - "test_campaign_1".to_string(), - ) - .unwrap(); let resp = cancel( deps.as_mut(), @@ -94,14 +87,6 @@ fn test_cancel_as_campaign_owner() { ) .unwrap(); - set_refundable( - deps.as_mut(), - env.clone(), - mock_info("creator", &[]), - "test_campaign_1".to_string(), - ) - .unwrap(); - let resp = cancel( deps.as_mut(), env.clone(), @@ -124,46 +109,6 @@ fn test_cancel_as_campaign_owner() { ); } -#[test] -fn test_cancel_non_refundable_campaign() { - let mut deps = mock_dependencies(); - let env = mock_env(); - - instantiate( - deps.as_mut(), - env.clone(), - mock_info("creator", &[]), - InstantiateMsg { - claim_reward_fee: Some(Uint128::new(999)), - }, - ) - .unwrap(); - - deposit( - deps.as_mut(), - env.clone(), - mock_info("sender1", &coins(100, "")), - "test_campaign_1".to_string(), - ) - .unwrap(); - - let res = cancel( - deps.as_mut(), - env.clone(), - mock_info("creator", &[]), - "test_campaign_1".to_string(), - ); - - assert_eq!( - res, - Err(StdError::generic_err( - "Campaign was not set to be refundable" - )) - ); - - assert!(CAMPAIGN_POOL.has(deps.as_ref().storage, "test_campaign_1".to_string())); -} - #[test] fn test_cancel_non_existent_campaign() { let mut deps = mock_dependencies(); diff --git a/src/tests/execute/check.rs b/src/tests/execute/check.rs index f7ea75a..161d3ae 100644 --- a/src/tests/execute/check.rs +++ b/src/tests/execute/check.rs @@ -10,7 +10,7 @@ use cosmwasm_std::{ use crate::contract::{ cancel, check, claim, deposit, instantiate, reward_all, set_claim_fee, set_cpool, - set_refundable, set_upool, withdraw, withdraw_fee, + set_upool, withdraw, withdraw_fee, }; use crate::msg::{ CampaignCheckRequest, CampaignCheckResponse, InstantiateMsg, UserRewardRequest, @@ -93,7 +93,6 @@ fn test_check() { Campaign { amount: Uint128::new(50), owner: Addr::unchecked("sender1"), - refundable: false, } ); @@ -106,7 +105,6 @@ fn test_check() { Campaign { amount: Uint128::new(80), owner: Addr::unchecked("sender2"), - refundable: false, } ); @@ -173,7 +171,6 @@ fn test_check_nonexistent_campaign() { Campaign { amount: Uint128::new(50), owner: Addr::unchecked("sender1"), - refundable: false, } ); diff --git a/src/tests/execute/claim.rs b/src/tests/execute/claim.rs index cc36845..fb40556 100644 --- a/src/tests/execute/claim.rs +++ b/src/tests/execute/claim.rs @@ -10,7 +10,7 @@ use cosmwasm_std::{ use crate::contract::{ cancel, check, claim, deposit, instantiate, reward_all, set_claim_fee, set_cpool, - set_refundable, set_upool, withdraw, withdraw_fee, + set_upool, withdraw, withdraw_fee, }; use crate::msg::{ CampaignCheckRequest, CampaignCheckResponse, InstantiateMsg, UserRewardRequest, diff --git a/src/tests/execute/deposit.rs b/src/tests/execute/deposit.rs index eb802c7..deca0e4 100644 --- a/src/tests/execute/deposit.rs +++ b/src/tests/execute/deposit.rs @@ -10,7 +10,7 @@ use cosmwasm_std::{ use crate::contract::{ cancel, check, claim, deposit, instantiate, reward_all, set_claim_fee, set_cpool, - set_refundable, set_upool, withdraw, withdraw_fee, + set_upool, withdraw, withdraw_fee, }; use crate::msg::{ CampaignCheckRequest, CampaignCheckResponse, InstantiateMsg, UserRewardRequest, @@ -48,7 +48,6 @@ fn test_deposit() { Ok(Campaign { amount: Uint128::new(1000000), owner: Addr::unchecked("sender"), - refundable: false, }) ); @@ -67,7 +66,6 @@ fn test_deposit() { Ok(Campaign { amount: Uint128::new(2000000), owner: Addr::unchecked("sender"), - refundable: false, }) ); } diff --git a/src/tests/execute/mod.rs b/src/tests/execute/mod.rs index b74b59b..e72c478 100644 --- a/src/tests/execute/mod.rs +++ b/src/tests/execute/mod.rs @@ -5,7 +5,6 @@ mod deposit; mod reward_all; mod set_claim_fee; mod set_cpool; -mod set_refundable; mod set_upool; mod withdraw; mod withdraw_fee; diff --git a/src/tests/execute/reward_all.rs b/src/tests/execute/reward_all.rs index 99f422f..b9e11fd 100644 --- a/src/tests/execute/reward_all.rs +++ b/src/tests/execute/reward_all.rs @@ -10,7 +10,7 @@ use cosmwasm_std::{ use crate::contract::{ cancel, check, claim, deposit, instantiate, reward_all, set_claim_fee, set_cpool, - set_refundable, set_upool, withdraw, withdraw_fee, + set_upool, withdraw, withdraw_fee, }; use crate::msg::{ CampaignCheckRequest, CampaignCheckResponse, InstantiateMsg, UserRewardRequest, @@ -88,7 +88,6 @@ fn test_reward_all() { Campaign { amount: Uint128::new(1), owner: Addr::unchecked("sender"), - refundable: false, } ); diff --git a/src/tests/execute/set_claim_fee.rs b/src/tests/execute/set_claim_fee.rs index 2201224..2863900 100644 --- a/src/tests/execute/set_claim_fee.rs +++ b/src/tests/execute/set_claim_fee.rs @@ -10,7 +10,7 @@ use cosmwasm_std::{ use crate::contract::{ cancel, check, claim, deposit, instantiate, reward_all, set_claim_fee, set_cpool, - set_refundable, set_upool, withdraw, withdraw_fee, + set_upool, withdraw, withdraw_fee, }; use crate::msg::{ CampaignCheckRequest, CampaignCheckResponse, InstantiateMsg, UserRewardRequest, diff --git a/src/tests/execute/set_cpool.rs b/src/tests/execute/set_cpool.rs index 471badc..e017306 100644 --- a/src/tests/execute/set_cpool.rs +++ b/src/tests/execute/set_cpool.rs @@ -10,7 +10,7 @@ use cosmwasm_std::{ use crate::contract::{ cancel, check, claim, deposit, instantiate, reward_all, set_claim_fee, set_cpool, - set_refundable, set_upool, withdraw, withdraw_fee, + set_upool, withdraw, withdraw_fee, }; use crate::msg::{ CampaignCheckRequest, CampaignCheckResponse, InstantiateMsg, UserRewardRequest, @@ -51,7 +51,6 @@ fn test_set_new_cpool() { Campaign { amount: Uint128::new(100), owner: Addr::unchecked("creator"), - refundable: false, } ); } @@ -97,7 +96,6 @@ fn test_set_existing_cpool() { Campaign { amount: Uint128::new(2000), owner: Addr::unchecked("sender1"), - refundable: false, } ); } diff --git a/src/tests/execute/set_refundable.rs b/src/tests/execute/set_refundable.rs deleted file mode 100644 index ff99a57..0000000 --- a/src/tests/execute/set_refundable.rs +++ /dev/null @@ -1,138 +0,0 @@ -use std::vec; - -use cosmwasm_std::testing::{ - mock_dependencies, mock_dependencies_with_balance, mock_env, mock_info, -}; -use cosmwasm_std::{ - coins, from_binary, from_json, Addr, Api, BankMsg, CanonicalAddr, CosmosMsg, DepsMut, Env, - MessageInfo, StdError, SubMsg, Uint128, -}; - -use crate::contract::{ - cancel, check, claim, deposit, instantiate, reward_all, set_claim_fee, set_cpool, - set_refundable, set_upool, withdraw, withdraw_fee, -}; -use crate::msg::{ - CampaignCheckRequest, CampaignCheckResponse, InstantiateMsg, UserRewardRequest, - UserRewardResponse, -}; -use crate::state::{Campaign, State, CAMPAIGN_POOL, STATE, USER_POOL}; - -#[test] -fn test_set_refundable() { - let mut deps = mock_dependencies(); - let env = mock_env(); - - instantiate( - deps.as_mut(), - env.clone(), - mock_info("creator", &[]), - InstantiateMsg { - claim_reward_fee: Some(Uint128::new(999)), - }, - ) - .unwrap(); - - deposit( - deps.as_mut(), - env.clone(), - mock_info("sender1", &coins(100, "")), - "test_campaign_1".to_string(), - ) - .unwrap(); - - assert!(set_refundable( - deps.as_mut(), - env.clone(), - mock_info("creator", &[]), - "test_campaign_1".to_string(), - ) - .is_ok()); - - // check campaign - let campaign = CAMPAIGN_POOL - .load(deps.as_ref().storage, "test_campaign_1".to_string()) - .unwrap(); - assert_eq!( - campaign, - Campaign { - amount: Uint128::new(100), - owner: Addr::unchecked("sender1"), - refundable: true, - } - ); -} - - -#[test] -fn test_set_refundable_on_non_existent_campaign() { - let mut deps = mock_dependencies(); - let env = mock_env(); - - instantiate( - deps.as_mut(), - env.clone(), - mock_info("creator", &[]), - InstantiateMsg { - claim_reward_fee: Some(Uint128::new(999)), - }, - ) - .unwrap(); - - let res = set_refundable( - deps.as_mut(), - env.clone(), - mock_info("creator", &[]), - "test_campaign_1".to_string(), - ); - assert_eq!(res, Err(StdError::generic_err("Campaign does not exist"))); - - // check campaign - assert_eq!( - CAMPAIGN_POOL.has(deps.as_ref().storage, "test_campaign_1".to_string()), - false - ); -} - -#[test] -fn test_set_refundable_unauthorized() { - let mut deps = mock_dependencies(); - let env = mock_env(); - - instantiate( - deps.as_mut(), - env.clone(), - mock_info("creator", &[]), - InstantiateMsg { - claim_reward_fee: Some(Uint128::new(999)), - }, - ) - .unwrap(); - - deposit( - deps.as_mut(), - env.clone(), - mock_info("sender1", &coins(100, "")), - "test_campaign_1".to_string(), - ) - .unwrap(); - - - let res = set_refundable( - deps.as_mut(), - env.clone(), - mock_info("not_creator", &[]), - "test_campaign_1".to_string(), - ); - assert_eq!(res, Err(StdError::generic_err("Only contract owner can make the campaign refundable"))); - - // check campaign - assert_eq!( - CAMPAIGN_POOL.load(deps.as_ref().storage, "test_campaign_1".to_string()).unwrap(), - Campaign { - amount: Uint128::new(100), - owner: Addr::unchecked("sender1"), - refundable: false, - } - ); -} diff --git a/src/tests/execute/set_upool.rs b/src/tests/execute/set_upool.rs index 1fc763f..98d0656 100644 --- a/src/tests/execute/set_upool.rs +++ b/src/tests/execute/set_upool.rs @@ -10,7 +10,7 @@ use cosmwasm_std::{ use crate::contract::{ cancel, check, claim, deposit, instantiate, reward_all, set_claim_fee, set_cpool, - set_refundable, set_upool, withdraw, withdraw_fee, + set_upool, withdraw, withdraw_fee, }; use crate::msg::{ CampaignCheckRequest, CampaignCheckResponse, InstantiateMsg, UserRewardRequest, diff --git a/src/tests/execute/withdraw.rs b/src/tests/execute/withdraw.rs index 97a8f2d..bbbd1a0 100644 --- a/src/tests/execute/withdraw.rs +++ b/src/tests/execute/withdraw.rs @@ -10,7 +10,7 @@ use cosmwasm_std::{ use crate::contract::{ cancel, check, claim, deposit, instantiate, reward_all, set_claim_fee, set_cpool, - set_refundable, set_upool, withdraw, withdraw_fee, + set_upool, withdraw, withdraw_fee, }; use crate::msg::{ CampaignCheckRequest, CampaignCheckResponse, InstantiateMsg, UserRewardRequest, diff --git a/src/tests/execute/withdraw_fee.rs b/src/tests/execute/withdraw_fee.rs index 3af781b..74408f7 100644 --- a/src/tests/execute/withdraw_fee.rs +++ b/src/tests/execute/withdraw_fee.rs @@ -10,7 +10,7 @@ use cosmwasm_std::{ use crate::contract::{ cancel, check, claim, deposit, instantiate, reward_all, set_claim_fee, set_cpool, - set_refundable, set_upool, withdraw, withdraw_fee, + set_upool, withdraw, withdraw_fee, }; use crate::msg::{ CampaignCheckRequest, CampaignCheckResponse, InstantiateMsg, UserRewardRequest, diff --git a/src/tests/query/campaign_pool.rs b/src/tests/query/campaign_pool.rs index 1e6e70d..b6cc131 100644 --- a/src/tests/query/campaign_pool.rs +++ b/src/tests/query/campaign_pool.rs @@ -10,7 +10,7 @@ use cosmwasm_std::{ use crate::contract::{ cancel, check, claim, deposit, instantiate, query_campaign_pool, reward_all, set_claim_fee, - set_cpool, set_refundable, set_upool, withdraw, withdraw_fee, + set_cpool, set_upool, withdraw, withdraw_fee, }; use crate::msg::{ CampaignCheckRequest, CampaignCheckResponse, InstantiateMsg, UserRewardRequest, @@ -49,7 +49,6 @@ fn test_query_campaign_pool() { Campaign { amount: Uint128::new(1000), owner: Addr::unchecked("sender1"), - refundable: false, } ); } diff --git a/src/tests/query/claim_fee.rs b/src/tests/query/claim_fee.rs index 8c9b262..aaff6cb 100644 --- a/src/tests/query/claim_fee.rs +++ b/src/tests/query/claim_fee.rs @@ -10,7 +10,7 @@ use cosmwasm_std::{ use crate::contract::{ cancel, check, claim, deposit, instantiate, query_campaign_pool, query_user_pool, reward_all, - set_claim_fee, set_cpool, set_refundable, set_upool, withdraw, withdraw_fee, query_claim_fee, + set_claim_fee, set_cpool, set_upool, withdraw, withdraw_fee, query_claim_fee, }; use crate::msg::{ CampaignCheckRequest, CampaignCheckResponse, InstantiateMsg, UserRewardRequest, diff --git a/src/tests/query/user_pool.rs b/src/tests/query/user_pool.rs index 62ea990..ec27cbf 100644 --- a/src/tests/query/user_pool.rs +++ b/src/tests/query/user_pool.rs @@ -10,7 +10,7 @@ use cosmwasm_std::{ use crate::contract::{ cancel, check, claim, deposit, instantiate, query_campaign_pool, query_user_pool, reward_all, - set_claim_fee, set_cpool, set_refundable, set_upool, withdraw, withdraw_fee, + set_claim_fee, set_cpool, set_upool, withdraw, withdraw_fee, }; use crate::msg::{ CampaignCheckRequest, CampaignCheckResponse, InstantiateMsg, UserRewardRequest,