Skip to content
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

Jump to bottom

Allow Closed pools to be opened #695

Merged
merged 11 commits into from
Jul 18, 2022
Merged

Allow Closed pools to be opened #695

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d37ad94
Add `PoolStatus::Open`
maltekliemann Jul 3, 2022
494c5fc
Fix benchmark
maltekliemann Jul 4, 2022
7dcbaad
Add new pool status `Initialized`
maltekliemann Jul 6, 2022
66cde95
Fix benchmark
maltekliemann Jul 6, 2022
1ca7260
Fix `types.json`
maltekliemann Jul 7, 2022
1b5303c
Merge branch 'main' into open-pool
maltekliemann Jul 12, 2022
2a5dbe0
Update zrml/swaps/src/lib.rs
maltekliemann Jul 13, 2022
876c854
Update zrml/swaps/src/tests.rs
maltekliemann Jul 13, 2022
54204c9
Extend pool parameters checks
maltekliemann Jul 13, 2022
95a7add
Fix status errors
maltekliemann Jul 14, 2022
db42671
Update changelog
maltekliemann Jul 17, 2022
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
6 changes: 6 additions & 0 deletions zrml/swaps/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,10 @@ mod pallet {
) -> DispatchResultWithPostInfo {
let who = ensure_signed(origin)?;
let pool = Self::pool_by_id(pool_id)?;
ensure!(
matches!(pool.pool_status, PoolStatus::Initialized | PoolStatus::Active),
Error::<T>::InvalidPoolStatus,
);
maltekliemann marked this conversation as resolved.
Show resolved Hide resolved
let pool_account_id = Pallet::<T>::pool_account_id(pool_id);

let params = PoolParams {
Expand Down Expand Up @@ -764,6 +768,8 @@ mod pallet {
InvalidAmountArgument,
/// Could not create CPMM pool since no fee was supplied.
InvalidFeeArgument,
/// Dispatch called on pool with invalid status.
InvalidPoolStatus,
/// A function that is only valid for pools with specific scoring rules was called for a
/// pool with another scoring rule.
InvalidScoringRule,
Expand Down
98 changes: 84 additions & 14 deletions zrml/swaps/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,21 +515,88 @@ fn end_subsidy_phase_distributes_shares_and_outcome_assets() {
});
}

#[test]
fn single_asset_operations_and_swaps_fail_on_closed_cpmm_pools() {
#[test_case(PoolStatus::Initialized; "Initialized")]
#[test_case(PoolStatus::Closed; "Closed")]
#[test_case(PoolStatus::Clean; "Clean")]
fn single_asset_operations_and_swaps_fail_on_invalid_status_before_clean(status: PoolStatus) {
ExtBuilder::default().build().execute_with(|| {
use zeitgeist_primitives::traits::Swaps as _;
create_initial_pool_with_funds_for_alice(ScoringRule::CPMM, Some(0), true);
let pool_id = 0;
// For this test, we need to give Alice some pool shares, as well. We don't do this in
// `create_initial_pool_...` so that there are exacly 100 pool shares, making computations
// in other tests easier.
let _ = Currencies::deposit(Swaps::pool_shares_id(0), &ALICE, _25);
assert_ok!(Swaps::pool_join(alice_signed(), 0, _1, vec!(_1, _1, _1, _1),));
assert_ok!(Currencies::deposit(Swaps::pool_shares_id(0), &ALICE, _25));
assert_ok!(Swaps::mutate_pool(pool_id, |pool| {
pool.pool_status = status;
Ok(())
}));

assert_ok!(Swaps::close_pool(0));
assert_noop!(
Swaps::pool_exit_with_exact_asset_amount(alice_signed(), pool_id, ASSET_A, _1, _2),
crate::Error::<Runtime>::PoolIsNotActive
);
assert_noop!(
Swaps::pool_exit_with_exact_pool_amount(alice_signed(), pool_id, ASSET_A, _1, _1_2),
crate::Error::<Runtime>::PoolIsNotActive
);
assert_noop!(
Swaps::pool_join_with_exact_asset_amount(alice_signed(), pool_id, ASSET_E, 1, 1),
crate::Error::<Runtime>::PoolIsNotActive
);
assert_noop!(
Swaps::pool_join_with_exact_pool_amount(alice_signed(), pool_id, ASSET_E, 1, 1),
crate::Error::<Runtime>::PoolIsNotActive
);
assert_ok!(Currencies::deposit(ASSET_A, &ALICE, u64::MAX.into()));
assert_noop!(
Swaps::swap_exact_amount_in(
alice_signed(),
pool_id,
ASSET_A,
u64::MAX.into(),
ASSET_B,
Some(_1),
Some(_1),
),
crate::Error::<Runtime>::PoolIsNotActive
);
assert_noop!(
Swaps::swap_exact_amount_out(
alice_signed(),
pool_id,
ASSET_A,
Some(u64::MAX.into()),
ASSET_B,
_1,
Some(_1),
),
crate::Error::<Runtime>::PoolIsNotActive
);
});
}

#[test]
fn pool_join_fails_if_pool_is_closed() {
ExtBuilder::default().build().execute_with(|| {
create_initial_pool_with_funds_for_alice(ScoringRule::CPMM, Some(0), true);
let pool_id = 0;
assert_ok!(Swaps::close_pool(pool_id));
assert_noop!(
Swaps::pool_join(Origin::signed(ALICE), pool_id, _1, vec![_1, _1, _1, _1]),
crate::Error::<Runtime>::InvalidPoolStatus,
);
});
}

#[test]
fn most_operations_fail_if_pool_is_clean() {
ExtBuilder::default().build().execute_with(|| {
create_initial_pool_with_funds_for_alice(ScoringRule::CPMM, Some(0), true);
let pool_id = 0;
assert_ok!(Swaps::close_pool(pool_id));
assert_ok!(Swaps::clean_up_pool(
&MarketType::Categorical(0),
0,
pool_id,
&OutcomeReport::Categorical(if let Asset::CategoricalOutcome(_, idx) = ASSET_A {
idx
} else {
Expand All @@ -538,28 +605,31 @@ fn single_asset_operations_and_swaps_fail_on_closed_cpmm_pools() {
&Default::default()
));

assert_ok!(Swaps::pool_exit(alice_signed(), 0, _1, vec!(_1_2, _1_2)));
assert_noop!(
Swaps::pool_exit_with_exact_asset_amount(alice_signed(), 0, ASSET_A, _1, _2),
Swaps::pool_join(Origin::signed(ALICE), pool_id, _1, vec![_10]),
crate::Error::<Runtime>::InvalidPoolStatus,
);
assert_noop!(
Swaps::pool_exit_with_exact_asset_amount(alice_signed(), pool_id, ASSET_A, _1, _2),
crate::Error::<Runtime>::PoolIsNotActive
);
assert_noop!(
Swaps::pool_exit_with_exact_pool_amount(alice_signed(), 0, ASSET_A, _1, _1_2),
Swaps::pool_exit_with_exact_pool_amount(alice_signed(), pool_id, ASSET_A, _1, _1_2),
crate::Error::<Runtime>::PoolIsNotActive
);
assert_noop!(
Swaps::pool_join_with_exact_asset_amount(alice_signed(), 0, ASSET_E, 1, 1),
Swaps::pool_join_with_exact_asset_amount(alice_signed(), pool_id, ASSET_E, 1, 1),
crate::Error::<Runtime>::PoolIsNotActive
);
assert_noop!(
Swaps::pool_join_with_exact_pool_amount(alice_signed(), 0, ASSET_E, 1, 1),
Swaps::pool_join_with_exact_pool_amount(alice_signed(), pool_id, ASSET_E, 1, 1),
crate::Error::<Runtime>::PoolIsNotActive
);
assert_ok!(Currencies::deposit(ASSET_A, &ALICE, u64::MAX.into()));
assert_noop!(
Swaps::swap_exact_amount_in(
alice_signed(),
0,
pool_id,
ASSET_A,
u64::MAX.into(),
ASSET_B,
Expand All @@ -571,7 +641,7 @@ fn single_asset_operations_and_swaps_fail_on_closed_cpmm_pools() {
assert_noop!(
Swaps::swap_exact_amount_out(
alice_signed(),
0,
pool_id,
ASSET_A,
Some(u64::MAX.into()),
ASSET_B,
Expand Down