fix tests for amm cache (#2001)

Author: wphan

sdk/src/adminClient.ts

@@ -507,6 +507,12 @@ export class AdminClient extends DriftClient {
 	): Promise<TransactionSignature> {
 		const currentPerpMarketIndex = this.getStateAccount().numberOfMarkets;
 
+		const ammCachePublicKey = getAmmCachePublicKey(this.program.programId);
+		const ammCacheAccount = await this.connection.getAccountInfo(
+			ammCachePublicKey
+		);
+		const mustInitializeAmmCache = ammCacheAccount?.data == null;
+
 		const initializeMarketIxs = await this.getInitializePerpMarketIx(
 			marketIndex,
 			priceOracle,
@@ -534,7 +540,8 @@ export class AdminClient extends DriftClient {
 			curveUpdateIntensity,
 			ammJitIntensity,
 			name,
-			lpPoolId
+			lpPoolId,
+			mustInitializeAmmCache
 		);
 		const tx = await this.buildTransaction(initializeMarketIxs);
 
@@ -581,7 +588,8 @@ export class AdminClient extends DriftClient {
 		curveUpdateIntensity = 0,
 		ammJitIntensity = 0,
 		name = DEFAULT_MARKET_NAME,
-		lpPoolId: number = 0
+		lpPoolId: number = 0,
+		includeInitAmmCacheIx = false
 	): Promise<TransactionInstruction[]> {
 		const perpMarketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
@@ -590,6 +598,10 @@ export class AdminClient extends DriftClient {
 
 		const ixs: TransactionInstruction[] = [];
 
+		if (includeInitAmmCacheIx) {
+			ixs.push(await this.getInitializeAmmCacheIx());
+		}
+
 		const nameBuffer = encodeName(name);
 		const initPerpIx = await this.program.instruction.initializePerpMarket(
 			marketIndex,

tests/lpPool.ts

@@ -191,8 +191,6 @@ describe('LP Pool', () => {
 		solUsdLazer = getPythLazerOraclePublicKey(program.programId, 6);
 		await adminClient.initializePythLazerOracle(6);
 
-		await adminClient.initializeAmmCache();
-
 		await adminClient.initializePerpMarket(
 			0,
 			solUsd,
@@ -1741,7 +1739,6 @@ describe('LP Pool', () => {
 	// 	)) as AmmCache;
 
 	// 	await adminClient.deleteAmmCache();
-	// 	await adminClient.initializeAmmCache();
 	// 	await adminClient.resizeAmmCache();
 	// 	await adminClient.updateInitialAmmCacheInfo([0, 1, 2]);
 	// 	await adminClient.updateAmmCache([0, 1, 2]);

tests/lpPoolCUs.ts

@@ -171,8 +171,6 @@ describe('LP Pool', () => {
 
 		solUsd = await mockOracleNoProgram(bankrunContextWrapper, 200);
 
-		await adminClient.initializeAmmCache();
-
 		adminClient = new TestClient({
 			connection: bankrunContextWrapper.connection.toConnection(),
 			wallet: new anchor.Wallet(keypair),

tests/lpPoolSwap.ts

@@ -176,8 +176,6 @@ describe('LP Pool', () => {
 
 		const periodicity = new BN(0);
 
-		await adminClient.initializeAmmCache();
-
 		await adminClient.initializePerpMarket(
 			0,
 			spotMarketOracle,