Skip to content

Modify lm redeem #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ark930 merged 6 commits into from
Sep 25, 2021
Merged

Modify lm redeem #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3edc4ff
:sparkles: ($PALLET) Add option value to redeem
AllenPocketGamer Sep 24, 2021
d143f00
:white_check_mark: ($PALLET) Cover unit-tests on last modification
AllenPocketGamer Sep 24, 2021
5551190
:bug: ($PALLET) Fix benchmarks after modification
AllenPocketGamer Sep 24, 2021
960b011
:sparkles: ($PALLET) Add redeem_all
AllenPocketGamer Sep 24, 2021
d2ddc24
:white_check_mark: ($PALLET) Cover unit-tests
AllenPocketGamer Sep 24, 2021
446f821
:bug: ($PALLET) Fix benchmark and weights
AllenPocketGamer Sep 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 74 additions & 36 deletions pallets/liquidity-mining/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ benchmarks! {

let duration = T::MinimumDuration::get().saturating_add(1u128.saturated_into());
let min_deposit_to_start = T::MinimumDepositOfUser::get();
let reward_amount: BalanceOf<T> = UNIT.saturated_into();
let amount: BalanceOf<T> = UNIT.saturated_into();

assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_1, &caller, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_2, &caller, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_1, &caller, amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_2, &caller, amount));

assert_ok!(LM::<T>::create_pool(
(FARMING_DEPOSIT_1, FARMING_DEPOSIT_2),
(REWARD_1, reward_amount),
vec![(REWARD_2, reward_amount)].try_into().unwrap(),
(REWARD_1, amount),
vec![(REWARD_2, amount)].try_into().unwrap(),
PoolType::Farming,
duration,
min_deposit_to_start,
Expand All @@ -68,20 +68,20 @@ benchmarks! {
deposit {
let duration = T::MinimumDuration::get().saturating_add(1u128.saturated_into());
let min_deposit_to_start = T::MinimumDepositOfUser::get();
let reward_amount: BalanceOf<T> = UNIT.saturated_into();
let amount: BalanceOf<T> = UNIT.saturated_into();

let investor: T::AccountId = account("lm", 0, 0);
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_1, &investor, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_2, &investor, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_1, &investor, amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_2, &investor, amount));

let caller: T::AccountId = whitelisted_caller();
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_1, &caller, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_2, &caller, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_1, &caller, amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_2, &caller, amount));

assert_ok!(LM::<T>::create_pool(
(FARMING_DEPOSIT_1, FARMING_DEPOSIT_2),
(REWARD_1, reward_amount),
vec![(REWARD_2, reward_amount)].try_into().unwrap(),
(REWARD_1, amount),
vec![(REWARD_2, amount)].try_into().unwrap(),
PoolType::Farming,
duration,
min_deposit_to_start,
Expand All @@ -95,20 +95,20 @@ benchmarks! {
redeem {
let duration = T::MinimumDuration::get().saturating_add(1u128.saturated_into());
let min_deposit_to_start = T::MinimumDepositOfUser::get();
let reward_amount: BalanceOf<T> = UNIT.saturated_into();
let amount: BalanceOf<T> = UNIT.saturated_into();

let investor: T::AccountId = account("lm", 0, 0);
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_1, &investor, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_2, &investor, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_1, &investor, amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_2, &investor, amount));

let caller: T::AccountId = whitelisted_caller();
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_1, &caller, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_2, &caller, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_1, &caller, amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_2, &caller, amount));

assert_ok!(LM::<T>::create_pool(
(FARMING_DEPOSIT_1, FARMING_DEPOSIT_2),
(REWARD_1, reward_amount),
vec![(REWARD_2, reward_amount)].try_into().unwrap(),
(REWARD_1, amount),
vec![(REWARD_2, amount)].try_into().unwrap(),
PoolType::Farming,
duration,
min_deposit_to_start,
Expand All @@ -117,7 +117,45 @@ benchmarks! {

assert_ok!(LM::<T>::charge(RawOrigin::Signed(investor).into(), 0));

assert_ok!(LM::<T>::deposit(RawOrigin::Signed(caller.clone()).into(), 0, reward_amount));
assert_ok!(LM::<T>::deposit(RawOrigin::Signed(caller.clone()).into(), 0, amount));

// Run to block
run_to_block::<T>(duration);

}: _(RawOrigin::Signed(caller.clone()), 0, amount)
verify {
let pool = LM::<T>::pool(0);
let deposit_data = LM::<T>::user_deposit_data(0, caller.clone());
assert!(pool.is_none());
assert!(deposit_data.is_none());
}

redeem_all {
let duration = T::MinimumDuration::get().saturating_add(1u128.saturated_into());
let min_deposit_to_start = T::MinimumDepositOfUser::get();
let amount: BalanceOf<T> = UNIT.saturated_into();

let investor: T::AccountId = account("lm", 0, 0);
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_1, &investor, amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_2, &investor, amount));

let caller: T::AccountId = whitelisted_caller();
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_1, &caller, amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_2, &caller, amount));

assert_ok!(LM::<T>::create_pool(
(FARMING_DEPOSIT_1, FARMING_DEPOSIT_2),
(REWARD_1, amount),
vec![(REWARD_2, amount)].try_into().unwrap(),
PoolType::Farming,
duration,
min_deposit_to_start,
0u128.saturated_into()
));

assert_ok!(LM::<T>::charge(RawOrigin::Signed(investor).into(), 0));

assert_ok!(LM::<T>::deposit(RawOrigin::Signed(caller.clone()).into(), 0, amount));

// Run to block
run_to_block::<T>(duration);
Expand All @@ -133,20 +171,20 @@ benchmarks! {
volunteer_to_redeem {
let duration = T::MinimumDuration::get().saturating_add(1u128.saturated_into());
let min_deposit_to_start = T::MinimumDepositOfUser::get();
let reward_amount: BalanceOf<T> = UNIT.saturated_into();
let amount: BalanceOf<T> = UNIT.saturated_into();

let investor: T::AccountId = account("lm", 0, 0);
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_1, &investor, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_2, &investor, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_1, &investor, amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_2, &investor, amount));

let caller: T::AccountId = whitelisted_caller();
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_1, &caller, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_2, &caller, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_1, &caller, amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_2, &caller, amount));

assert_ok!(LM::<T>::create_pool(
(FARMING_DEPOSIT_1, FARMING_DEPOSIT_2),
(REWARD_1, reward_amount),
vec![(REWARD_2, reward_amount)].try_into().unwrap(),
(REWARD_1, amount),
vec![(REWARD_2, amount)].try_into().unwrap(),
PoolType::Farming,
duration,
min_deposit_to_start,
Expand All @@ -155,7 +193,7 @@ benchmarks! {

assert_ok!(LM::<T>::charge(RawOrigin::Signed(investor).into(), 0));

assert_ok!(LM::<T>::deposit(RawOrigin::Signed(caller.clone()).into(), 0, reward_amount));
assert_ok!(LM::<T>::deposit(RawOrigin::Signed(caller.clone()).into(), 0, amount));

// Run to block
run_to_block::<T>(duration);
Expand All @@ -173,20 +211,20 @@ benchmarks! {
claim {
let duration = T::MinimumDuration::get().saturating_add(1u128.saturated_into());
let min_deposit_to_start = T::MinimumDepositOfUser::get();
let reward_amount: BalanceOf<T> = UNIT.saturated_into();
let amount: BalanceOf<T> = UNIT.saturated_into();

let investor: T::AccountId = account("lm", 0, 0);
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_1, &investor, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_2, &investor, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_1, &investor, amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(REWARD_2, &investor, amount));

let caller: T::AccountId = whitelisted_caller();
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_1, &caller, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_2, &caller, reward_amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_1, &caller, amount));
assert_ok!(<T as Config>::MultiCurrency::deposit(FARMING_DEPOSIT_2, &caller, amount));

assert_ok!(LM::<T>::create_pool(
(FARMING_DEPOSIT_1, FARMING_DEPOSIT_2),
(REWARD_1, reward_amount),
vec![(REWARD_2, reward_amount)].try_into().unwrap(),
(REWARD_1, amount),
vec![(REWARD_2, amount)].try_into().unwrap(),
PoolType::Farming,
duration,
min_deposit_to_start,
Expand All @@ -195,7 +233,7 @@ benchmarks! {

assert_ok!(LM::<T>::charge(RawOrigin::Signed(investor).into(), 0));

assert_ok!(LM::<T>::deposit(RawOrigin::Signed(caller.clone()).into(), 0, reward_amount));
assert_ok!(LM::<T>::deposit(RawOrigin::Signed(caller.clone()).into(), 0, amount));

// Run to block
run_to_block::<T>(1u128.saturated_into());
Expand Down
Loading