Merge pull request #284 from nasqn/fix/change_xyk_pallet_errors

fix(xyk)!: change xyk pallet errors
galacticcouncil · Jun 28, 2021 · 18b05cb · 18b05cb
2 parents e5692e3 + 04df8df
commit 18b05cb
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pallets/exchange/src/tests.rs b/pallets/exchange/src/tests.rs
@@ -2261,7 +2261,7 @@ fn discount_tests_with_error() {
 				user_4_sell_intention_id,
 				DispatchError::Module {
 					index: 2,
-					error: 19,
+					error: 20,
 					message: None,
 				},
 			)
@@ -2276,7 +2276,7 @@ fn discount_tests_with_error() {
 				user_2_sell_intention_id,
 				DispatchError::Module {
 					index: 2,
-					error: 19,
+					error: 20,
 					message: None,
 				},
 			)
@@ -2291,7 +2291,7 @@ fn discount_tests_with_error() {
 				user_3_sell_intention_id,
 				DispatchError::Module {
 					index: 2,
-					error: 19,
+					error: 20,
 					message: None,
 				},
 			)
@@ -2880,7 +2880,7 @@ fn simple_sell_sell_with_error_should_not_pass() {
 				user_2_sell_intention_id,
 				DispatchError::Module {
 					index: 2,
-					error: 8,
+					error: 9,
 					message: None,
 				},
 			)
@@ -2895,7 +2895,7 @@ fn simple_sell_sell_with_error_should_not_pass() {
 				user_3_sell_intention_id,
 				DispatchError::Module {
 					index: 2,
-					error: 8,
+					error: 9,
 					message: None,
 				},
 			)

diff --git a/pallets/xyk/Cargo.toml b/pallets/xyk/Cargo.toml
@@ -6,7 +6,7 @@ homepage = 'https://github.com/galacticcouncil/hydradx-node'
 license = 'Apache 2.0'
 name = 'pallet-xyk'
 repository = 'https://github.com/galacticcouncil/hydradx-node'
-version = '1.2.0'
+version = '2.0.0'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']

diff --git a/pallets/xyk/src/lib.rs b/pallets/xyk/src/lib.rs
@@ -119,8 +119,11 @@ pub mod pallet {
 		/// Overflow
 		InvalidLiquidityAmount, // no tests
 
-		/// Given trading limit has been exceeded (Sell) or has Not been reached (buy).
-		AssetBalanceLimitExceeded,
+		/// Asset amount has exceeded given limit.
+		AssetAmountExceededLimit,
+
+		/// Asset amount has not reached given limit.
+		AssetAmountNotReachedLimit,
 
 		/// Asset balance is not sufficient.
 		InsufficientAssetBalance,
@@ -319,7 +322,7 @@ pub mod pallet {
 
 			ensure!(
 				amount_b_required <= amount_b_max_limit,
-				Error::<T>::AssetBalanceLimitExceeded
+				Error::<T>::AssetAmountExceededLimit
 			);
 
 			ensure!(shares_added > 0_u128, Error::<T>::InvalidMintedLiquidity);
@@ -626,7 +629,7 @@ impl<T: Config> AMM<T::AccountId, AssetId, AssetPair, Balance> for Pallet<T> {
 
 		ensure!(asset_out_reserve > amount_out, Error::<T>::InsufficientAssetBalance);
 
-		ensure!(min_bought <= amount_out_without_fee, Error::<T>::AssetBalanceLimitExceeded);
+		ensure!(min_bought <= amount_out_without_fee, Error::<T>::AssetAmountNotReachedLimit);
 
 		let discount_fee = if discount {
 			let native_asset = T::NativeAssetId::get();
@@ -753,7 +756,7 @@ impl<T: Config> AMM<T::AccountId, AssetId, AssetPair, Balance> for Pallet<T> {
 			.checked_add(transfer_fee)
 			.ok_or(Error::<T>::BuyAssetAmountInvalid)?;
 
-		ensure!(max_limit >= buy_price_with_fee, Error::<T>::AssetBalanceLimitExceeded);
+		ensure!(max_limit >= buy_price_with_fee, Error::<T>::AssetAmountExceededLimit);
 
 		ensure!(
 			T::Currency::free_balance(assets.asset_in, who) >= buy_price_with_fee,

diff --git a/pallets/xyk/src/tests.rs b/pallets/xyk/src/tests.rs
@@ -1051,7 +1051,7 @@ fn create_pool_with_same_assets_should_not_be_allowed() {
 }
 
 #[test]
-fn sell_test_exceeding_max_limit() {
+fn sell_test_not_reaching_limit() {
 	ExtBuilder::default().build().execute_with(|| {
 		let user_1 = ALICE;
 		let asset_a = ACA;
@@ -1087,7 +1087,7 @@ fn sell_test_exceeding_max_limit() {
 				1_000_000_000_000_000,
 				false,
 			),
-			Error::<Test>::AssetBalanceLimitExceeded
+			Error::<Test>::AssetAmountNotReachedLimit
 		);
 
 		assert_eq!(Currency::free_balance(asset_a, &user_1), 999800000000000);
@@ -1135,7 +1135,7 @@ fn buy_test_exceeding_max_limit() {
 				1_000_000_000,
 				false,
 			),
-			Error::<Test>::AssetBalanceLimitExceeded
+			Error::<Test>::AssetAmountExceededLimit
 		);
 
 		assert_eq!(Currency::free_balance(asset_a, &user_1), 999800000000000);