From 40b4ce65b5d4f321e4fcd3eb21bc351d6f9b3cdc Mon Sep 17 00:00:00 2001
From: Sniezka <dygons14@gmail.com>
Date: Thu, 18 Jul 2024 14:28:49 +0200
Subject: [PATCH] Resolved conflicts

---
 test/{ => sdk/e2e}/get-tickmap.test.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
 rename test/{ => sdk/e2e}/get-tickmap.test.ts (92%)

diff --git a/test/get-tickmap.test.ts b/test/sdk/e2e/get-tickmap.test.ts
similarity index 92%
rename from test/get-tickmap.test.ts
rename to test/sdk/e2e/get-tickmap.test.ts
index bc68f0fd..693d90ab 100644
--- a/test/get-tickmap.test.ts
+++ b/test/sdk/e2e/get-tickmap.test.ts
@@ -1,16 +1,16 @@
 import { ONE_ALPH, sleep, web3 } from '@alephium/web3'
 import { getSigner } from '@alephium/web3-test'
-import { Invariant } from '../src/invariant'
-import { Network } from '../src/network'
+import { Invariant } from '../../../src/invariant'
+import { Network } from '../../../src/network'
 import { PrivateKeyWallet } from '@alephium/web3-wallet'
-import { getBasicFeeTickSpacing } from '../src/snippets'
-import { TokenFaucetInstance } from '../artifacts/ts'
-import { initTokensXY, withdrawTokens } from '../src/testUtils'
-import { FeeTier, PoolKey } from '../artifacts/ts/types'
-import { balanceOf, newFeeTier, newPoolKey } from '../src/utils'
-import { GlobalMaxTick, GlobalMinTick } from '../src'
-import { ChunkSize, ChunksPerBatch } from '../src/consts'
-import { getMaxChunk, getMaxTick, getMinTick, toLiquidity } from '../src/math'
+import { getBasicFeeTickSpacing } from '../../../src/snippets'
+import { TokenFaucetInstance } from '../../../artifacts/ts'
+import { initTokensXY, withdrawTokens } from '../../../src/testUtils'
+import { FeeTier, PoolKey } from '../../../artifacts/ts/types'
+import { balanceOf, newFeeTier, newPoolKey } from '../../../src/utils'
+import { GlobalMaxTick, GlobalMinTick } from '../../../src'
+import { ChunkSize, ChunksPerBatch } from '../../../src/consts'
+import { getMaxChunk, getMaxTick, getMinTick, toLiquidity } from '../../../src/math'
 
 web3.setCurrentNodeProvider('http://127.0.0.1:22973')