Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feat/disable-claim-rewards' into…
Browse files Browse the repository at this point in the history
… feat/disable-claim-rewards
  • Loading branch information
dmoka committed Oct 30, 2024
2 parents 18fb044 + 4a8fcd4 commit d84c319
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion integration-tests/src/xyk_liquidity_mining.rs
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,7 @@ fn add_liquidity_and_join_farms_should_work_with_multiple_farm_entries() {
];
let deposit_id = 1;
let liquidity_amount = 5_000_000 * UNITS;
//Act
assert_ok!(XYKLiquidityMining::add_liquidity_and_join_farms(
RuntimeOrigin::signed(BOB.into()),
PEPE,
Expand Down Expand Up @@ -1178,7 +1179,6 @@ fn exit_farm_should_work_on_multiple_different_farms() {
dave_shares_balance,
));

//Act
set_relaychain_block_number(500);
assert_ok!(XYKLiquidityMining::redeposit_shares(
RuntimeOrigin::signed(DAVE.into()),
Expand All @@ -1202,6 +1202,7 @@ fn exit_farm_should_work_on_multiple_different_farms() {
(deposit_id, yield_farm_2_id, asset_pair),
(deposit_id2, yield_farm_3_id, asset_pair2),
];
//Act
assert_ok!(XYKLiquidityMining::exit_farms(
RuntimeOrigin::signed(DAVE.into()),
exit_entries.try_into().unwrap()
Expand Down
2 changes: 1 addition & 1 deletion runtime/hydradx/src/benchmarking/xyk_liquidity_mining.rs
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ runtime_benchmarks! {
run_to_block(400);
let lp1_rew_curr_balance = Currencies::free_balance(pair.asset_out, &lp1);
} : {
//We just fire and forget as claiming temporary disabled
//We just fire and forget as claiming is disabled
let _ = XYKLiquidityMining::claim_rewards(RawOrigin::Signed(lp1.clone()).into(), lp1_deposit_id, yfarm_id1);
}
verify {
Expand Down

0 comments on commit d84c319

Please sign in to comment.