Merge pull request #157 from notJoon/refactor-sqrt-price-math

Refactor: `sqrt-price-math`
gnoswap-labs · Feb 8, 2024 · 160aa2f · 160aa2f
2 parents 24da3df + e1269a7
commit 160aa2f
Show file tree

Hide file tree

Showing 4 changed files with 229 additions and 82 deletions.
diff --git a/pool/_TEST_math_logic_test.gnoa b/pool/_TEST_math_logic_test.gnoa
@@ -95,7 +95,7 @@ func TestDrySwap_ZeroForOneFalse_AmountSpecified_Positive_16000(t *testing.T) {
 		"_",       // recipient
 		false,     // zeroForOne
 		16000,     // amountSpecified
-		MAX_PRICE, // sqrtPriceLimitX96
+		consts.MAX_PRICE, // sqrtPriceLimitX96
 	)
 
 	shouldEQ(t, poolOut, bigint(-43468))
@@ -112,7 +112,7 @@ func TestDrySwap_ZeroForOneFalse_AmountSpecified_Negative_16000(t *testing.T) {
 		"_",       // recipient
 		false,     // zeroForOne
 		-16000,    // amountSpecified
-		MAX_PRICE, // sqrtPriceLimitX96
+		consts.MAX_PRICE, // sqrtPriceLimitX96
 	)
 	shouldEQ(t, poolOut, bigint(-16000))
 	shouldEQ(t, poolIn, bigint(5888))

diff --git a/pool/_TEST_pool_native_swap_test.gnoa b/pool/_TEST_pool_native_swap_test.gnoa
@@ -110,7 +110,7 @@ func TestSwapSellNative(t *testing.T) {
 		test1,
 		false,
 		bigint(10000),
-		MAX_PRICE,
+		consts.MAX_PRICE,
 		std.GetOrigCaller(),
 	)
 	shouldEQ(t, amount0, bigint(-3685))

diff --git a/pool/_TEST_pool_single_lp_test.gnoa b/pool/_TEST_pool_single_lp_test.gnoa
@@ -277,7 +277,7 @@ func TestSwap(t *testing.T) {
 		userOldToken0Bal := balanceOfByRegisterCall(pool.token0Path, test1)
 		userOldToken1Bal := balanceOfByRegisterCall(pool.token1Path, test1)
 
-		amount0, amount1 := Swap(barPath, fooPath, fee500, test1, false, 16000, MAX_PRICE, std.GetOrigCaller()) // give enough amount to take fees away
+		amount0, amount1 := Swap(barPath, fooPath, fee500, test1, false, 16000, consts.MAX_PRICE, std.GetOrigCaller()) // give enough amount to take fees away
 
 		poolNewToken0Bal := balanceOfByRegisterCall(pool.token0Path, poolAddr)
 		poolNewToken1Bal := balanceOfByRegisterCall(pool.token1Path, poolAddr)
@@ -341,7 +341,7 @@ func TestCollectProtocol(t *testing.T) {
 
 		std.TestSetPrevRealm("gno.land/r/demo/router")
 		std.TestSetOrigCaller(test1)
-		Swap(barPath, fooPath, fee500, test1, false, 200000, MAX_SQRT_RATIO-1, std.GetOrigCaller()) // swap token0 -> token1 => fee only in token0
+		Swap(barPath, fooPath, fee500, test1, false, 200000, consts.MAX_SQRT_RATIO-1, std.GetOrigCaller()) // swap token0 -> token1 => fee only in token0
 
 		test1OldToken0Bal := balanceOfByRegisterCall(pool.token0Path, test1)
 		test1OldToken1Bal := balanceOfByRegisterCall(pool.token1Path, test1)