diff --git a/zrml/prediction-markets/src/tests.rs b/zrml/prediction-markets/src/tests.rs index 5cdd90f40..a8d9ac815 100644 --- a/zrml/prediction-markets/src/tests.rs +++ b/zrml/prediction-markets/src/tests.rs @@ -686,7 +686,9 @@ fn create_market_and_deploy_assets_is_identical_to_sequential_calls() { weights )); - for (idx, amount) in amounts.into_iter().enumerate() { + for (idx, amount) in + amounts.into_iter().enumerate().filter(|(_, amount)| *amount > min_liqudity) + { assert_ok!(Swaps::pool_join_with_exact_asset_amount( Origin::signed(ALICE), pool_id, diff --git a/zrml/swaps/src/lib.rs b/zrml/swaps/src/lib.rs index e075aa839..1dd614a94 100644 --- a/zrml/swaps/src/lib.rs +++ b/zrml/swaps/src/lib.rs @@ -292,6 +292,7 @@ mod pallet { pool_amount: BalanceOf, min_asset_amount: BalanceOf, ) -> DispatchResult { + ensure!(pool_amount != Zero::zero(), Error::::MathApproximation); let pool = Self::pool_by_id(pool_id)?; let pool_ref = &pool; let who = ensure_signed(origin)?; @@ -313,6 +314,7 @@ mod pallet { pool.swap_fee.ok_or(Error::::PoolMissingFee)?.saturated_into(), )? .saturated_into(); + ensure!(asset_amount != Zero::zero(), Error::::MathApproximation); ensure!(asset_amount >= min_asset_amount, Error::::LimitOut); ensure!( asset_amount @@ -1554,6 +1556,7 @@ mod pallet { asset_amount: BalanceOf, min_pool_amount: BalanceOf, ) -> Result { + ensure!(asset_amount != Zero::zero(), Error::::MathApproximation); let pool = Pallet::::pool_by_id(pool_id)?; let pool_ref = &pool; let pool_account_id = Pallet::::pool_account_id(pool_id); diff --git a/zrml/swaps/src/tests.rs b/zrml/swaps/src/tests.rs index a3dafacb2..88890c8bf 100644 --- a/zrml/swaps/src/tests.rs +++ b/zrml/swaps/src/tests.rs @@ -555,7 +555,7 @@ fn out_amount_must_be_equal_or_less_than_max_out_ratio() { } #[test] -fn pool_amount_must_not_be_zero() { +fn pool_join_or_exit_raises_on_zero_value() { ExtBuilder::default().build().execute_with(|| { create_initial_pool_with_funds_for_alice(ScoringRule::CPMM, true); @@ -568,6 +568,26 @@ fn pool_amount_must_not_be_zero() { Swaps::pool_exit(alice_signed(), 0, 0, vec!(_1, _1, _1, _1)), crate::Error::::MathApproximation ); + + assert_noop!( + Swaps::pool_join_with_exact_pool_amount(alice_signed(), 0, ASSET_A, 0, 0), + crate::Error::::MathApproximation + ); + + assert_noop!( + Swaps::pool_join_with_exact_asset_amount(alice_signed(), 0, ASSET_A, 0, 0), + crate::Error::::MathApproximation + ); + + assert_noop!( + Swaps::pool_exit_with_exact_pool_amount(alice_signed(), 0, ASSET_A, 0, 0), + crate::Error::::MathApproximation + ); + + assert_noop!( + Swaps::pool_exit_with_exact_asset_amount(alice_signed(), 0, ASSET_A, 0, 0), + crate::Error::::MathApproximation + ); }); } @@ -1096,6 +1116,121 @@ fn create_pool_fails_on_too_few_assets() { }); } +// Macro for comparing fixed point u128. +macro_rules! assert_approx { + ($left:expr, $right:expr, $precision:expr $(,)?) => { + match (&$left, &$right, &$precision) { + (left_val, right_val, precision_val) => { + let diff = if *left_val > *right_val { + *left_val - *right_val + } else { + *right_val - *left_val + }; + if diff > $precision { + panic!("{} is not {}-close to {}", *left_val, *precision_val, *right_val); + } + } + } + }; +} + +#[test] +fn join_pool_exit_pool_does_not_create_extra_tokens() { + ExtBuilder::default().build().execute_with(|| { + create_initial_pool_with_funds_for_alice(ScoringRule::CPMM, true); + + ASSETS.iter().cloned().for_each(|asset| { + let _ = Currencies::deposit(asset, &CHARLIE, _100); + }); + + let amount = 123_456_789_123; // Strange number to force rounding errors! + assert_ok!(Swaps::pool_join( + Origin::signed(CHARLIE), + 0, + amount, + vec![_10000, _10000, _10000, _10000] + )); + assert_ok!(Swaps::pool_exit(Origin::signed(CHARLIE), 0, amount, vec![0, 0, 0, 0])); + + // It's not true that the balances are _exactly_ the same. But they only vary up to + // negligible precision! + let pool_account_id = Swaps::pool_account_id(0); + let precision = 30; + assert_approx!(Currencies::free_balance(ASSET_A, &pool_account_id), _100, precision); + assert_approx!(Currencies::free_balance(ASSET_B, &pool_account_id), _100, precision); + assert_approx!(Currencies::free_balance(ASSET_C, &pool_account_id), _100, precision); + assert_approx!(Currencies::free_balance(ASSET_D, &pool_account_id), _100, precision); + assert_approx!(Currencies::free_balance(ASSET_A, &CHARLIE), _100, precision); + assert_approx!(Currencies::free_balance(ASSET_B, &CHARLIE), _100, precision); + assert_approx!(Currencies::free_balance(ASSET_C, &CHARLIE), _100, precision); + assert_approx!(Currencies::free_balance(ASSET_D, &CHARLIE), _100, precision); + }); +} + +#[test] +fn create_pool_fails_on_weight_below_minimum_weight() { + ExtBuilder::default().build().execute_with(|| { + ASSETS.iter().cloned().for_each(|asset| { + let _ = Currencies::deposit(asset, &BOB, _100); + }); + assert_noop!( + Swaps::create_pool( + BOB, + ASSETS.iter().cloned().collect(), + Some(ASSETS.last().unwrap().clone()), + 0, + ScoringRule::CPMM, + Some(0), + Some(vec!(_2, ::MinWeight::get() - 1, _2, _2)) + ), + crate::Error::::BelowMinimumWeight, + ); + }); +} + +#[test] +fn create_pool_fails_on_weight_above_maximum_weight() { + ExtBuilder::default().build().execute_with(|| { + ASSETS.iter().cloned().for_each(|asset| { + let _ = Currencies::deposit(asset, &BOB, _100); + }); + assert_noop!( + Swaps::create_pool( + BOB, + ASSETS.iter().cloned().collect(), + Some(ASSETS.last().unwrap().clone()), + 0, + ScoringRule::CPMM, + Some(0), + Some(vec!(_2, ::MaxWeight::get() + 1, _2, _2)) + ), + crate::Error::::AboveMaximumWeight, + ); + }); +} + +#[test] +fn create_pool_fails_on_total_weight_above_maximum_total_weight() { + ExtBuilder::default().build().execute_with(|| { + ASSETS.iter().cloned().for_each(|asset| { + let _ = Currencies::deposit(asset, &BOB, _100); + }); + let weight = ::MaxTotalWeight::get() / 4 + 100; + assert_noop!( + Swaps::create_pool( + BOB, + ASSETS.iter().cloned().collect(), + Some(ASSETS.last().unwrap().clone()), + 0, + ScoringRule::CPMM, + Some(0), + Some(vec![weight; 4]), + ), + crate::Error::::MaxTotalWeight, + ); + }); +} + fn alice_signed() -> Origin { Origin::signed(ALICE) }